diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2017-06-23 20:35:03 +0300 |
|---|---|---|
| committer | Brett Cannon <brettcannon@users.noreply.github.com> | 2017-06-23 10:35:03 -0700 |
| commit | c38e32a10061a7c6d54e7e53ffabf7af7998f045 (patch) | |
| tree | 4a483af1b13929282fa42aeb90e9b1da5247b952 | |
| parent | d174d24a5d37d1516b885dc7c82f71ecd5930700 (diff) | |
| download | cpython-git-c38e32a10061a7c6d54e7e53ffabf7af7998f045.tar.gz | |
bpo-30645: don't append to an inner loop path in imp.load_package() (GH-2268)
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.
| -rw-r--r-- | Lib/imp.py | 5 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Lib/imp.py b/Lib/imp.py index 781ff23d25..866464b245 100644 --- a/Lib/imp.py +++ b/Lib/imp.py @@ -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)) @@ -57,6 +57,7 @@ Ankur Ankan Heidi Annexstad Ramchandra Apte Éric Araujo +Alexandru Ardelean Alicia Arlen Jeffrey Armstrong Jason Asbahr @@ -428,6 +428,10 @@ Library - bpo-30508: Don't log exceptions if Task/Future "cancel()" method was called. +- bpo-30645: Fix path calculation in `imp.load_package()`, fixing it for + cases when a package is only shipped with bytecodes. Patch by + Alexandru Ardelean. + - bpo-11822: The dis.dis() function now is able to disassemble nested code objects. |