[Python-checkins] cpython: Issue #14605: Don't error out if get_importer() returns None.
brett.cannon
python-checkins at python.org
Fri Apr 27 21:45:28 CEST 2012
http://hg.python.org/cpython/rev/141ed4b426e1
changeset: 76584:141ed4b426e1
user: Brett Cannon <brett at python.org>
date: Fri Apr 27 15:45:15 2012 -0400
summary:
Issue #14605: Don't error out if get_importer() returns None.
files:
Lib/pkgutil.py | 2 ++
Python/importlib.h | Bin
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py
--- a/Lib/pkgutil.py
+++ b/Lib/pkgutil.py
@@ -466,6 +466,8 @@
platform-specific special import locations such as the Windows registry.
"""
for importer in iter_importers(fullname):
+ if importer is None:
+ continue
loader = importer.find_module(fullname)
if loader is not None:
return loader
diff --git a/Python/importlib.h b/Python/importlib.h
index c4080da005e8b4c5facc10e8ed3aaee297a890c0..cc3ddc43349236a87b80a231ff6a6b576251f89e
GIT binary patch
[stripped]
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list