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

bpo-30645: don't append to an inner loop path in imp.load_package() (GH-2268)

Browse source 
Bug didn't manifest itself when importing a module with source as .py files are always the first on the search path. The issue only showed up in bytecode-only packages where the calculated file path would be ``__init__.py/__init__.pyc``.

Patch by Alexandru Ardelean.
This commit is contained in:
Alexandru Ardelean 2017-06-23 20:35:03 +03:00 • committed by Brett Cannon
parent d174d24a5d
commit c38e32a100
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/imp.py
View file

@ -203,8 +203,9 @@ def load_package(name, path):
extensions = (machinery.SOURCE_SUFFIXES[:] +
machinery.BYTECODE_SUFFIXES[:])
for extension in extensions:
path = os.path.join(path, '__init__'+extension)
if os.path.exists(path):
init_path = os.path.join(path, '__init__' + extension)
if os.path.exists(init_path):
path = init_path
break
else:
raise ValueError('{!r} is not a package'.format(path))