[Python-checkins] cpython (merge 3.4 -> default): Merge for issue #14710
brett.cannon
python-checkins at python.org
Fri May 23 18:32:43 CEST 2014
http://hg.python.org/cpython/rev/1adc8eb362f0
changeset: 90807:1adc8eb362f0
parent: 90805:b2c5d0cba5fd
parent: 90806:660c82192c69
user: Brett Cannon <brett at python.org>
date: Fri May 23 12:32:30 2014 -0400
summary:
Merge for issue #14710
files:
Lib/pkgutil.py | 4 +++-
Lib/test/test_pkgutil.py | 14 ++++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py
--- a/Lib/pkgutil.py
+++ b/Lib/pkgutil.py
@@ -456,6 +456,8 @@
"""
if module_or_name in sys.modules:
module_or_name = sys.modules[module_or_name]
+ if module_or_name is None:
+ return None
if isinstance(module_or_name, ModuleType):
module = module_or_name
loader = getattr(module, '__loader__', None)
@@ -487,7 +489,7 @@
# pkgutil previously raised ImportError
msg = "Error while finding loader for {!r} ({}: {})"
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):
diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py
--- a/Lib/test/test_pkgutil.py
+++ b/Lib/test/test_pkgutil.py
@@ -363,6 +363,20 @@
loader = pkgutil.get_loader(name)
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):
with check_warnings() as w:
self.assertIsNotNone(pkgutil.find_loader("sys"))
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list