mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Don't overwrite a __path__ value from extension modules if already

Browse source 
set.
This commit is contained in:
Brett Cannon 2012-08-11 19:43:29 -04:00
parent a6e8581449
commit b428f47cf6
2 changed files with 1671 additions and 1668 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/importlib/_bootstrap.py
View file

@ -1108,7 +1108,7 @@ class ExtensionFileLoader:
module = _call_with_frames_removed(_imp.load_dynamic,
fullname, self.path)
_verbose_message('extension module loaded from {!r}', self.path)
if self.is_package(fullname):
if self.is_package(fullname) and not hasattr(module, '__path__'):
module.__path__ = [_path_split(self.path)[0]]
return module
except:

3337
Python/importlib.h
View file

File diff suppressed because it is too large Load diff