From 0a390ce75489a44e4845d4e660f25e0c8d5c1ad5 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 15 Jul 2016 10:58:54 -0700 Subject: Issue #26844: Fix imp.find_module() to have the exception related to type issues be about 'path' instead of 'name'. Thanks to Lev Maximov for the patch. --- 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 index f6fff44201..e264391842 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 27bd691310..897b103723 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -939,6 +939,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 f10544c381..6911d1f6ac 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,6 +22,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. -- cgit v1.2.1