changeset:   97475:5a9ac801f9b4
branch:      3.5
parent:      97358:7cfe20a6395d
parent:      97379:cf3a62a8d786
user:        larry <larry@hastings.org>
date:        Tue Aug 11 18:59:15 2015 -0700
files:       Misc/NEWS
description:
Merged in brettcannon/cpython350/3.5 (pull request #2)

Issue #24492: make sure that ``from ... import ...` raises an ImportError if __name__ is not defined on a package.


diff -r 7cfe20a6395d -r 5a9ac801f9b4 Lib/test/test_import/__init__.py
--- a/Lib/test/test_import/__init__.py	Mon Aug 10 20:57:37 2015 -0700
+++ b/Lib/test/test_import/__init__.py	Tue Aug 11 18:59:15 2015 -0700
@@ -324,6 +324,19 @@
         with self.assertRaisesRegex(ImportError, "^cannot import name 'bogus'"):
             from re import bogus
 
+    def test_from_import_AttributeError(self):
+        # Issue #24492: trying to import an attribute that raises an
+        # AttributeError should lead to an ImportError.
+        class AlwaysAttributeError:
+            def __getattr__(self, _):
+                raise AttributeError
+
+        module_name = 'test_from_import_AttributeError'
+        self.addCleanup(unload, module_name)
+        sys.modules[module_name] = AlwaysAttributeError()
+        with self.assertRaises(ImportError):
+            from test_from_import_AttributeError import does_not_exist
+
 
 @skip_if_dont_write_bytecode
 class FilePermissionTests(unittest.TestCase):
diff -r 7cfe20a6395d -r 5a9ac801f9b4 Misc/NEWS
--- a/Misc/NEWS	Mon Aug 10 20:57:37 2015 -0700
+++ b/Misc/NEWS	Tue Aug 11 18:59:15 2015 -0700
@@ -23,6 +23,10 @@
 Core and Builtins
 -----------------
 
+- Issue #24492: A "package" lacking a __name__ attribute when trying to perform
+  a ``from .. import ...`` statement will trigger an ImportError instead of an
+  AttributeError.
+
 - Issue #24667: Resize odict in all cases that the underlying dict resizes.
 
 Library
diff -r 7cfe20a6395d -r 5a9ac801f9b4 Python/ceval.c
--- a/Python/ceval.c	Mon Aug 10 20:57:37 2015 -0700
+++ b/Python/ceval.c	Tue Aug 11 18:59:15 2015 -0700
@@ -5085,19 +5085,24 @@
        sys.modules. */
     PyErr_Clear();
     pkgname = _PyObject_GetAttrId(v, &PyId___name__);
-    if (pkgname == NULL)
-        return NULL;
+    if (pkgname == NULL) {
+        goto error;
+    }
     fullmodname = PyUnicode_FromFormat("%U.%U", pkgname, name);
     Py_DECREF(pkgname);
-    if (fullmodname == NULL)
+    if (fullmodname == NULL) {
         return NULL;
+    }
     x = PyDict_GetItem(PyImport_GetModuleDict(), fullmodname);
-    if (x == NULL)
-        PyErr_Format(PyExc_ImportError, "cannot import name %R", name);
-    else
-        Py_INCREF(x);
     Py_DECREF(fullmodname);
+    if (x == NULL) {
+        goto error;
+    }
+    Py_INCREF(x);
     return x;
+ error:
+    PyErr_Format(PyExc_ImportError, "cannot import name %R", name);
+    return NULL;
 }
 
 static int