Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #15662 -- Made sure the module_has_submodule utility function f…

…ollow correct PEP 302, passing the package as the second argument to the find_module method of the importer. Thanks, Bradley Ayers.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0e5d5d6218e61aa6a3ac8ddadbd0bb86f7b02aa0 1 parent 01d0bf0
@jezdez jezdez authored
View
2  django/utils/module_loading.py
@@ -12,7 +12,7 @@ def module_has_submodule(package, module_name):
except KeyError:
pass
for finder in sys.meta_path:
- if finder.find_module(name):
+ if finder.find_module(name, package):
return True
for entry in package.__path__: # No __path__, then not a package.
try:
View
30 tests/regressiontests/utils/module_loading.py
@@ -1,5 +1,6 @@
import os
import sys
+import imp
from zipimport import zipimporter
from django.utils import unittest
@@ -8,6 +9,12 @@
class DefaultLoader(unittest.TestCase):
+ def setUp(self):
+ sys.meta_path.insert(0, ProxyFinder())
+
+ def tearDown(self):
+ sys.meta_path.pop(0)
+
def test_loader(self):
"Normal module existence can be tested"
test_module = import_module('regressiontests.utils.test_module')
@@ -25,6 +32,10 @@ def test_loader(self):
self.assertFalse(module_has_submodule(test_module, 'no_such_module'))
self.assertRaises(ImportError, import_module, 'regressiontests.utils.test_module.no_such_module')
+ # A child that doesn't exist, but is the name of a package on the path
+ self.assertFalse(module_has_submodule(test_module, 'django'))
+ self.assertRaises(ImportError, import_module, 'regressiontests.utils.test_module.django')
+
# Don't be confused by caching of import misses
import types # causes attempted import of regressiontests.utils.types
self.assertFalse(module_has_submodule(sys.modules['regressiontests.utils'], 'types'))
@@ -84,6 +95,25 @@ def test_deep_loader(self):
self.assertFalse(module_has_submodule(egg_module, 'no_such_module'))
self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.no_such_module')
+class ProxyFinder(object):
+ def __init__(self):
+ self._cache = {}
+
+ def find_module(self, fullname, path=None):
+ tail = fullname.rsplit('.', 1)[-1]
+ try:
+ self._cache[fullname] = imp.find_module(tail, path)
+ except ImportError:
+ return None
+ else:
+ return self # this is a loader as well
+
+ def load_module(self, fullname):
+ if fullname in sys.modules:
+ return sys.modules[fullname]
+ fd, fn, info = self._cache[fullname]
+ return imp.load_module(fullname, fd, fn, info)
+
class TestFinder(object):
def __init__(self, *args, **kwargs):
self.importer = zipimporter(*args, **kwargs)
Please sign in to comment.
Something went wrong with that request. Please try again.