[Python-checkins] cpython (merge 3.5 -> default): Merge for #26844
brett.cannon
python-checkins at python.org
Fri Jul 15 13:59:16 EDT 2016
https://hg.python.org/cpython/rev/46da639f7114
changeset: 102358:46da639f7114
parent: 102356:35bf83ff0828
parent: 102357:22eaf6158e7b
user: Brett Cannon <brett at python.org>
date: Fri Jul 15 10:59:11 2016 -0700
summary:
Merge for #26844
files:
Lib/imp.py | 4 ++--
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Lib/imp.py b/Lib/imp.py
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -266,8 +266,8 @@
raise TypeError("'name' must be a str, not {}".format(type(name)))
elif not isinstance(path, (type(None), list)):
# Backwards-compatibility
- raise RuntimeError("'list' must be None or a list, "
- "not {}".format(type(name)))
+ raise RuntimeError("'path' must be None or a list, "
+ "not {}".format(type(path)))
if path is None:
if is_builtin(name):
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -949,6 +949,7 @@
mattip
Martin Matusiak
Dieter Maurer
+Lev Maximov
Daniel May
Madison May
Lucas Maystre
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -51,6 +51,9 @@
Library
-------
+- Issue #26844: Fix error message for imp.find_module() to refer to 'path'
+ instead of 'name'. Patch by Lev Maximov.
+
- Issue #23804: Fix SSL zero-length recv() calls to not block and not raise
an error about unclean EOF.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list