test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #13404 -- Reworked module_has_submodule() to allow it to work under AppEngine. Thanks to Waldemar Kornewald for the report and testing help. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-04-25 13:18:24 +00:00
parent d2fec79d7b
commit 9872badf33
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/utils/module_loading.py
View File

@ -2,18 +2,17 @@ import os
import imp import imp
def module_has_submodule(mod, submod_name): def module_has_submodule(mod, submod_name):
# If the module was loaded from an egg, __loader__ will be set and # If the module was loaded from an egg, __loader__ will be set and
# its find_module must be used to search for submodules. # its find_module must be used to search for submodules.
loader = getattr(mod, '__loader__', None) loader = getattr(mod, '__loader__', None)
if loader: if loader:
mod_path = "%s.%s" % (mod.__name__, submod_name) mod_path = "%s.%s" % (mod.__name__.rsplit('.',1)[-1], submod_name)
mod_path = mod_path[len(loader.prefix):]
x = loader.find_module(mod_path) x = loader.find_module(mod_path)
if x is None: if x is None:
# zipimport.zipimporter.find_module is documented to take # zipimport.zipimporter.find_module is documented to take
# dotted paths but in fact through Pyton 2.7 is observed # dotted paths but in fact through Python 2.7 is observed
# to require os.sep in place of dots...so try using os.sep # to require os.sep in place of dots...so try using os.sep
# if the dotted path version failed to find the requested # if the dotted path version failed to find the requested
# submodule. # submodule.
x = loader.find_module(mod_path.replace('.', os.sep)) x = loader.find_module(mod_path.replace('.', os.sep))
return x is not None return x is not None