From: Brett Cannon <brettcannon@users.noreply.github.com>
Date: Fri, 23 Jun 2017 18:23:36 +0000 (-0700)
Subject: [3.6] bpo-30645: don't append to an inner loop path in imp.load_package() (GH-2268... 
X-Git-Tag: v3.6.3rc1~309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9db3ae045dd462a2da2e016c44231de1befd1f87;p=python

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

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.

(cherry picked from commit c38e32a10061a7c6d54e7e53ffabf7af7998f045)
---

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))
diff --git a/Misc/ACKS b/Misc/ACKS
index 03f9ea6cc9..c68f9eb9f1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -56,6 +56,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 94a29d0363..371dcf8ff0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -101,6 +101,10 @@ Library
   variable-argument parameters wrapped with partialmethod.
   Patch by Dong-hee Na.
 
+- 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-29931: Fixed comparison check for ipaddress.ip_interface objects.
   Patch by Sanjay Sundaresan.