mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 03:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge for issue #14710

Browse source
This commit is contained in:
Brett Cannon 2014-05-23 12:32:30 -04:00
commit 17f9cc07f3
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/pkgutil.py
View file

@ -456,6 +456,8 @@ def get_loader(module_or_name):
""" """
if module_or_name in sys.modules: if module_or_name in sys.modules:
module_or_name = sys.modules[module_or_name] module_or_name = sys.modules[module_or_name]
if module_or_name is None:
return None
if isinstance(module_or_name, ModuleType): if isinstance(module_or_name, ModuleType):
module = module_or_name module = module_or_name
loader = getattr(module, '__loader__', None) loader = getattr(module, '__loader__', None)
@ -487,7 +489,7 @@ def find_loader(fullname):
# pkgutil previously raised ImportError # pkgutil previously raised ImportError
msg = "Error while finding loader for {!r} ({}: {})" msg = "Error while finding loader for {!r} ({}: {})"
raise ImportError(msg.format(fullname, type(ex), ex)) from ex raise ImportError(msg.format(fullname, type(ex), ex)) from ex
return spec.loader return spec.loader if spec is not None else None
def extend_path(path, name): def extend_path(path, name):

14
Lib/test/test_pkgutil.py
View file

@ -363,6 +363,20 @@ class ImportlibMigrationTests(unittest.TestCase):
loader = pkgutil.get_loader(name) loader = pkgutil.get_loader(name)
self.assertIsNone(loader) self.assertIsNone(loader)
def test_get_loader_None_in_sys_modules(self):
name = 'totally bogus'
sys.modules[name] = None
try:
loader = pkgutil.get_loader(name)
finally:
del sys.modules[name]
self.assertIsNone(loader)
def test_find_loader_missing_module(self):
name = 'totally bogus'
loader = pkgutil.find_loader(name)
self.assertIsNone(loader)
def test_find_loader_avoids_emulation(self): def test_find_loader_avoids_emulation(self):
with check_warnings() as w: with check_warnings() as w:
self.assertIsNotNone(pkgutil.find_loader("sys")) self.assertIsNotNone(pkgutil.find_loader("sys"))