From: Alexandru Ardelean <ardeleanalex@gmail.com>
Date: Fri, 23 Jun 2017 17:35:03 +0000 (+0300)
Subject: bpo-30645: don't append to an inner loop path in imp.load_package() (GH-2268)
X-Git-Tag: v3.7.0a1~535
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c38e32a10061a7c6d54e7e53ffabf7af7998f045;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/imp.py b/Lib/imp.py
index 781ff23d2521..866464b245b2 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))
diff --git a/Misc/ACKS b/Misc/ACKS
index 4f98e980bd97..eaff17232c9a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -57,6 +57,7 @@ Ankur Ankan
 Heidi Annexstad
 Ramchandra Apte
 Éric Araujo
+Alexandru Ardelean
 Alicia Arlen
 Jeffrey Armstrong
 Jason Asbahr
diff --git a/Misc/NEWS b/Misc/NEWS
index 55e5bceb16ed..fc9e1dee6fc1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.