Fixed #28241 -- Allowed module_has_submodule()'s module_name arg to be a dotted path.

This commit is contained in:
Thomas Khyn 2017-06-09 06:34:20 +12:00 committed by Tim Graham
parent af69f14e7b
commit f6bd00131e
4 changed files with 21 additions and 1 deletions

View File

@ -70,7 +70,14 @@ def module_has_submodule(package, module_name):
return False
full_module_name = package_name + '.' + module_name
try:
return importlib_find(full_module_name, package_path) is not None
except (ImportError, AttributeError):
# When module_name is an invalid dotted path, Python raises ImportError
# (or ModuleNotFoundError in Python 3.6+). AttributeError may be raised
# if the penultimate part of the path is not a package.
# (http://bugs.python.org/issue30436)
return False
def module_dir(module):

View File

@ -0,0 +1 @@
content = 'Grandchild Module'

View File

@ -48,6 +48,18 @@ class DefaultLoader(unittest.TestCase):
with self.assertRaises(ImportError):
import_module('utils_tests.test_no_submodule.anything')
def test_has_sumbodule_with_dotted_path(self):
"""Nested module existence can be tested."""
test_module = import_module('utils_tests.test_module')
# A grandchild that exists.
self.assertIs(module_has_submodule(test_module, 'child_module.grandchild_module'), True)
# A grandchild that doesn't exist.
self.assertIs(module_has_submodule(test_module, 'child_module.no_such_module'), False)
# A grandchild whose parent doesn't exist.
self.assertIs(module_has_submodule(test_module, 'no_such_module.grandchild_module'), False)
# A grandchild whose parent is not a package.
self.assertIs(module_has_submodule(test_module, 'good_module.no_such_module'), False)
class EggLoader(unittest.TestCase):
def setUp(self):