summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-07-09 17:24:34 (GMT)
committerBrett Cannon <brett@python.org>2012-07-09 17:24:34 (GMT)
commitbf7eab077fe146dd76f5e7ddad3ff8b2d271fe6c (patch)
treeb8339d4693365edbaa2d0b0a8d6a54cb30810448
parentcd9b746b37fae46df2a8b669b5965272ab565ff8 (diff)
downloadcpython-bf7eab077fe146dd76f5e7ddad3ff8b2d271fe6c.zip
cpython-bf7eab077fe146dd76f5e7ddad3ff8b2d271fe6c.tar.gz
cpython-bf7eab077fe146dd76f5e7ddad3ff8b2d271fe6c.tar.bz2
Issue #15256: Re-use the ImportError exception message as defined by
importlib._bootstrap in imp to fix a grammatical mistake. Thanks to Marc Abramowitz for the patch.
-rw-r--r--Lib/imp.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/imp.py b/Lib/imp.py
index fcfd3d3..f947c3d 100644
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -230,7 +230,7 @@ def find_module(name, path=None):
continue
break # Break out of outer loop when breaking out of inner loop.
else:
- raise ImportError('No module name {!r}'.format(name), name=name)
+ raise ImportError(_bootstrap._ERR_MSG.format(name), name=name)
encoding = None
if mode == 'U':
diff --git a/Misc/NEWS b/Misc/NEWS
index 6d896c2..727414f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,8 @@ Core and Builtins
Library
-------
+- Issue #15256: Grammatical mistake in exception raised by imp.find_module().
+
- Issue #5931: wsgiref environ variable SERVER_SOFTWARE will specify an
implementation specific term like Cpython, Jython instead of generic "Python"