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

Issue #17117: Have both import itself and importlib.util.set_loader()

Browse source 
set __loader__ on a module when set to None.

Thanks to Gökcen Eraslan for the fix.
This commit is contained in:
Brett Cannon 2013-03-13 10:41:36 -07:00
parent aa73a1c9c9
commit 4802becb16
8 changed files with 3446 additions and 3378 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/importlib/_bootstrap.py
View file

@ -494,7 +494,7 @@ def set_loader(fxn):
"""Set __loader__ on the returned module."""
def set_loader_wrapper(self, *args, **kwargs):
module = fxn(self, *args, **kwargs)
if not hasattr(module, '__loader__'):
if getattr(module, '__loader__', None) is None:
module.__loader__ = self
return module
_wrap(set_loader_wrapper, fxn)
@ -875,12 +875,9 @@ class _LoaderBasics:
module.__cached__ = module.__file__
else:
module.__cached__ = module.__file__
module.__package__ = name
if self.is_package(name):
module.__path__ = [_path_split(module.__file__)[0]]
else:
module.__package__ = module.__package__.rpartition('.')[0]
module.__loader__ = self
# __package__ and __loader set by @module_for_loader.
_call_with_frames_removed(exec, code_object, module.__dict__)
return module
@ -1551,7 +1548,7 @@ def _find_and_load_unlocked(name, import_):
except AttributeError:
pass
# Set loader if need be.
if not hasattr(module, '__loader__'):
if getattr(module, '__loader__', None) is None:
try:
module.__loader__ = loader
except AttributeError: