changeset:   102358:46da639f7114
parent:      102356:35bf83ff0828
parent:      102357:22eaf6158e7b
user:        Brett Cannon <brett@python.org>
date:        Fri Jul 15 10:59:11 2016 -0700
files:       Lib/imp.py Misc/ACKS Misc/NEWS
description:
Merge for #26844


diff -r 35bf83ff0828 -r 46da639f7114 Lib/imp.py
--- a/Lib/imp.py	Fri Jul 15 10:41:49 2016 -0700
+++ b/Lib/imp.py	Fri Jul 15 10:59:11 2016 -0700
@@ -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 -r 35bf83ff0828 -r 46da639f7114 Misc/ACKS
--- a/Misc/ACKS	Fri Jul 15 10:41:49 2016 -0700
+++ b/Misc/ACKS	Fri Jul 15 10:59:11 2016 -0700
@@ -949,6 +949,7 @@
 mattip
 Martin Matusiak
 Dieter Maurer
+Lev Maximov
 Daniel May
 Madison May
 Lucas Maystre
diff -r 35bf83ff0828 -r 46da639f7114 Misc/NEWS
--- a/Misc/NEWS	Fri Jul 15 10:41:49 2016 -0700
+++ b/Misc/NEWS	Fri Jul 15 10:59:11 2016 -0700
@@ -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.