mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Issue #14710: Fix both pkgutil.find_loader() and get_loader() to not

Browse source 
raise an exception when a module doesn't exist.

Thanks to Pavel Aslanov for the bug report.
This commit is contained in:
Brett Cannon 2014-05-23 12:30:37 -04:00
parent 065266450e
commit 8447c703d1
3 changed files with 23 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:
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 @@ def find_loader(fullname):
# 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):