Merge for #26844

3 files changed, 6 insertions, 2 deletions

diff --git a/Lib/imp.py b/Lib/imp.py
index b33995267b..781ff23d25 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 e3752b2b39..942f311718 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 e3d01ba656..57977b4fcd 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.