From a79e4fb38d6e598be56944ead5753e65ad561bab Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Fri, 12 Jul 2013 11:22:26 -0400
Subject: [PATCH] Issue #18342: Use the repr of a module name for ``from ...
 import ...`` when an ImportError occurs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Other cases had already been switched over to using the repr.

Thanks to Tomasz Maćkowiak for the patch.
---
 Lib/test/test_import.py | 8 ++++++++
 Misc/ACKS               | 1 +
 Misc/NEWS               | 3 +++
 Python/ceval.c          | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index e6a43792ee3..61df86a841b 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -321,6 +321,14 @@ class ImportTests(unittest.TestCase):
         stdout, stderr = popen.communicate()
         self.assertIn(b"ImportError", stdout)
 
+    def test_from_import_message_for_nonexistent_module(self):
+        with self.assertRaisesRegexp(ImportError, "^No module named 'bogus'"):
+            from bogus import foo
+
+    def test_from_import_message_for_existing_module(self):
+        with self.assertRaisesRegexp(ImportError, "^cannot import name 'bogus'"):
+            from re import bogus
+
 
 @skip_if_dont_write_bytecode
 class FilePermissionTests(unittest.TestCase):
diff --git a/Misc/ACKS b/Misc/ACKS
index abfa6593472..ef5fb5c816c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -786,6 +786,7 @@ Andrew I MacIntyre
 Tim MacKenzie
 Nick Maclaren
 Don MacMillen
+Tomasz Maćkowiak
 Steve Majewski
 Grzegorz Makarewicz
 David Malcolm
diff --git a/Misc/NEWS b/Misc/NEWS
index 751433fd398..b65498abe46 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #18342: Use the repr of a module name when an import fails when using
+  ``from ... import ...``.
+
 - Issue #17872: Fix a segfault in marshal.load() when input stream returns
   more bytes than requested.
 
diff --git a/Python/ceval.c b/Python/ceval.c
index a53e377d4b7..61928e39fe7 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4602,7 +4602,7 @@ import_from(PyObject *v, PyObject *name)
 
     x = PyObject_GetAttr(v, name);
     if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
-        PyErr_Format(PyExc_ImportError, "cannot import name %S", name);
+        PyErr_Format(PyExc_ImportError, "cannot import name %R", name);
     }
     return x;
 }