From: Nick Coghlan <ncoghlan@gmail.com>
Date: Tue, 26 May 2015 11:48:17 +0000 (+1000)
Subject: Issue #24285: fix importing extensions from packages
X-Git-Tag: v3.5.0b2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55871f04bf0ac1cf0c7b1efd82780b4bf979d4f0;p=thirdparty%2FPython%2Fcpython.git

Issue #24285: fix importing extensions from packages
---

diff --git a/Lib/test/test_importlib/extension/test_loader.py b/Lib/test/test_importlib/extension/test_loader.py
index 66ac2b12b513..5813ade953fd 100644
--- a/Lib/test/test_importlib/extension/test_loader.py
+++ b/Lib/test/test_importlib/extension/test_loader.py
@@ -170,6 +170,13 @@ class MultiPhaseExtensionModuleTests(abc.LoaderTests):
         loader.exec_module(module)
         return module
 
+    def test_load_submodule(self):
+        '''Test loading a simulated submodule'''
+        module = self.load_module_by_name('pkg.' + self.name)
+        self.assertIsInstance(module, types.ModuleType)
+        self.assertEqual(module.__name__, 'pkg.' + self.name)
+        self.assertEqual(module.str_const, 'something different')
+
     def test_load_twice(self):
         '''Test that 2 loads result in 2 module objects'''
         module1 = self.load_module_by_name(self.name)
diff --git a/Misc/NEWS b/Misc/NEWS
index e2d01dcdaf99..f3745ac434eb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: 2015-07-05
 Core and Builtins
 -----------------
 
+- Issue #24285: Fixed regression that prevented importing extension modules
+  from inside packages. Patch by Petr Viktorin.
+
 Library
 -------
 
@@ -24,7 +27,8 @@ Core and Builtins
 
 - Issue #24276: Fixed optimization of property descriptor getter.
 
-- Issue #24268: PEP 489: Multi-phase extension module initialization
+- Issue #24268: PEP 489: Multi-phase extension module initialization.
+  Patch by Petr Viktorin.
 
 - Issue #23955: Add pyvenv.cfg option to suppress registry/environment
   lookup for generating sys.path on Windows.
diff --git a/Python/importdl.c b/Python/importdl.c
index bb90391c0bd1..579d2c5fada8 100644
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -45,7 +45,7 @@ get_encoded_name(PyObject *name, const char **hook_prefix) {
     if (lastdot < -1) {
         return NULL;
     } else if (lastdot >= 0) {
-        tmp = PyUnicode_Substring(name, lastdot, name_len);
+        tmp = PyUnicode_Substring(name, lastdot + 1, name_len);
         if (tmp == NULL)
             return NULL;
         name = tmp;