summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2016-07-15 17:59:11 (GMT)
committerBrett Cannon <brett@python.org>2016-07-15 17:59:11 (GMT)
commit896e87a99c8b889315a0d72e864360ec575c6b5e (patch)
tree3a1ab751086c05c1b866666953c65b086698cb80
parent044283a426f1ffc09e4994b121ba588a46bf1318 (diff)
parentf76457e12203d301c94e33957ff7121a24856b83 (diff)
downloadcpython-896e87a99c8b889315a0d72e864360ec575c6b5e.zip
cpython-896e87a99c8b889315a0d72e864360ec575c6b5e.tar.gz
cpython-896e87a99c8b889315a0d72e864360ec575c6b5e.tar.bz2
Merge for #26844
-rw-r--r--Lib/imp.py4
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
3 files changed, 6 insertions, 2 deletions
diff --git a/Lib/imp.py b/Lib/imp.py
index b339952..781ff23 100644
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -266,8 +266,8 @@ def find_module(name, path=None):
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
index e3752b2..942f311 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -949,6 +949,7 @@ Graham Matthews
mattip
Martin Matusiak
Dieter Maurer
+Lev Maximov
Daniel May
Madison May
Lucas Maystre
diff --git a/Misc/NEWS b/Misc/NEWS
index e3d01ba..57977b4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -51,6 +51,9 @@ Core and Builtins
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.