[3.5] Backport bpo-30876 (GH-2639), bpo-18018 and bpo-26367. (#2677)

serhiy-storchaka · web-flow · commit c824cc8426a1 · 2017-07-23T09:44:05.000+03:00
* bpo-30876: Relative import from unloaded package now reimports the package instead of failing with SystemError. Relative import from non-package now fails with ImportError rather than SystemError. (cherry picked from commit 8a9cd20) * bpo-18018: Import raises ImportError instead of SystemError if a relative import is attempted without a known parent package. * bpo-26367: importlib.__init__() raises ImportError like builtins.__import__() when ``level`` is specified but without an accompanying package specified.
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
@@ -925,10 +925,9 @@ def _sanity_check(name, package, level):
     if level > 0:
         if not isinstance(package, str):
             raise TypeError('__package__ not set to a string')
-        elif package not in sys.modules:
-            msg = ('Parent module {!r} not loaded, cannot perform relative '
-                   'import')
-            raise SystemError(msg.format(package))
+        elif not package:
+            raise ImportError('attempted relative import with no known parent '
+                              'package')
     if not name and level == 0:
         raise ValueError('Empty module name')
 
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
@@ -22,8 +22,9 @@
     EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython,
     make_legacy_pyc, rmtree, run_unittest, swap_attr, swap_item, temp_umask,
     unlink, unload, create_empty_file, cpython_only, TESTFN_UNENCODABLE,
-    temp_dir)
+    temp_dir, DirsOnSysPath)
 from test.support import script_helper
+from test.test_importlib.util import uncache
 
 
 skip_if_dont_write_bytecode = unittest.skipIf(
@@ -600,11 +601,11 @@ def check_relative():
 
         # Check relative import fails with only __package__ wrong
         ns = dict(__package__='foo', __name__='test.notarealmodule')
-        self.assertRaises(SystemError, check_relative)
+        self.assertRaises(ImportError, check_relative)
 
         # Check relative import fails with __package__ and __name__ wrong
         ns = dict(__package__='foo', __name__='notarealpkg.notarealmodule')
-        self.assertRaises(SystemError, check_relative)
+        self.assertRaises(ImportError, check_relative)
 
         # Check relative import fails with package set to a non-string
         ns = dict(__package__=object())
@@ -619,6 +620,20 @@ def test_absolute_import_without_future(self):
             self.fail("explicit relative import triggered an "
                       "implicit absolute import")
 
+    def test_import_from_non_package(self):
+        path = os.path.join(os.path.dirname(__file__), 'data', 'package2')
+        with uncache('submodule1', 'submodule2'), DirsOnSysPath(path):
+            with self.assertRaises(ImportError):
+                import submodule1
+            self.assertNotIn('submodule1', sys.modules)
+            self.assertNotIn('submodule2', sys.modules)
+
+    def test_import_from_unloaded_package(self):
+        with uncache('package2', 'package2.submodule1', 'package2.submodule2'), \
+             DirsOnSysPath(os.path.join(os.path.dirname(__file__), 'data')):
+            import package2.submodule1
+            package2.submodule1.submodule2
+
 
 class OverridingImportBuiltinTests(unittest.TestCase):
     def test_override_builtin(self):
diff --git a/Lib/test/test_import/data/package2/submodule1.py b/Lib/test/test_import/data/package2/submodule1.py
@@ -0,0 +1,3 @@
+import sys
+sys.modules.pop(__package__, None)
+from . import submodule2
diff --git a/Lib/test/test_import/data/package2/submodule2.py b/Lib/test/test_import/data/package2/submodule2.py
diff --git a/Lib/test/test_importlib/import_/test___package__.py b/Lib/test/test_importlib/import_/test___package__.py
@@ -61,7 +61,7 @@ def test_None_as___package__(self):
 
     def test_bad__package__(self):
         globals = {'__package__': '<not real>'}
-        with self.assertRaises(SystemError):
+        with self.assertRaises(ImportError):
             self.__import__('', globals, {}, ['relimport'], 1)
 
     def test_bunk__package__(self):
diff --git a/Lib/test/test_importlib/import_/test_relative_imports.py b/Lib/test/test_importlib/import_/test_relative_imports.py
@@ -207,8 +207,13 @@ def test_relative_import_no_globals(self):
         with self.assertRaises(KeyError):
             self.__import__('sys', level=1)
 
+    def test_relative_import_no_package(self):
+        with self.assertRaises(ImportError):
+            self.__import__('a', {'__package__': '', '__spec__': None},
+                            level=1)
+
     def test_relative_import_no_package_exists_absolute(self):
-        with self.assertRaises(SystemError):
+        with self.assertRaises(ImportError):
             self.__import__('sys', {'__package__': '', '__spec__': None},
                             level=1)
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-07-11-06-31-32.bpo-30876.x35jZX.rst b/Misc/NEWS.d/next/Core and Builtins/2017-07-11-06-31-32.bpo-30876.x35jZX.rst
@@ -0,0 +1,3 @@
+Relative import from unloaded package now reimports the package instead of
+failing with SystemError.  Relative import from non-package now fails with
+ImportError rather than SystemError.
diff --git a/Python/import.c b/Python/import.c
@@ -1461,11 +1461,9 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
                 Py_DECREF(partition);
             }
         }
-
-        if (PyDict_GetItem(interp->modules, package) == NULL) {
-            PyErr_Format(PyExc_SystemError,
-                    "Parent module %R not loaded, cannot perform relative "
-                    "import", package);
+        if (PyUnicode_GET_LENGTH(package) == 0) {
+            PyErr_SetString(PyExc_ImportError,
+                    "attempted relative import with no known parent package");
             goto error;
         }
     }
diff --git a/Python/importlib.h b/Python/importlib.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import sys`
	`2`	`+sys.modules.pop(__package__, None)`
	`3`	`+from . import submodule2`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Relative import from unloaded package now reimports the package instead of`
	`2`	`+failing with SystemError. Relative import from non-package now fails with`
	`3`	`+ImportError rather than SystemError.`
Original file line number	Diff line number	Diff line change
`@@ -1461,11 +1461,9 @@ PyImport_ImportModuleLevelObject(PyObject name, PyObject given_globals,`
`1461`	`1461`	`Py_DECREF(partition);`
`1462`	`1462`	`}`
`1463`	`1463`	`}`
`1464`		`-`
`1465`		`- if (PyDict_GetItem(interp->modules, package) == NULL) {`
`1466`		`- PyErr_Format(PyExc_SystemError,`
`1467`		`- "Parent module %R not loaded, cannot perform relative "`
`1468`		`- "import", package);`
	`1464`	`+ if (PyUnicode_GET_LENGTH(package) == 0) {`
	`1465`	`+ PyErr_SetString(PyExc_ImportError,`
	`1466`	`+ "attempted relative import with no known parent package");`
`1469`	`1467`	`goto error;`
`1470`	`1468`	`}`
`1471`	`1469`	`}`