Kaydet (Commit) 896e87a9 authored tarafından Brett Cannon's avatar Brett Cannon

Merge for #26844

...@@ -266,8 +266,8 @@ def find_module(name, path=None): ...@@ -266,8 +266,8 @@ def find_module(name, path=None):
raise TypeError("'name' must be a str, not {}".format(type(name))) raise TypeError("'name' must be a str, not {}".format(type(name)))
elif not isinstance(path, (type(None), list)): elif not isinstance(path, (type(None), list)):
# Backwards-compatibility # Backwards-compatibility
raise RuntimeError("'list' must be None or a list, " raise RuntimeError("'path' must be None or a list, "
"not {}".format(type(name))) "not {}".format(type(path)))
if path is None: if path is None:
if is_builtin(name): if is_builtin(name):
......
...@@ -949,6 +949,7 @@ Graham Matthews ...@@ -949,6 +949,7 @@ Graham Matthews
mattip mattip
Martin Matusiak Martin Matusiak
Dieter Maurer Dieter Maurer
Lev Maximov
Daniel May Daniel May
Madison May Madison May
Lucas Maystre Lucas Maystre
......
...@@ -51,6 +51,9 @@ Core and Builtins ...@@ -51,6 +51,9 @@ Core and Builtins
Library 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 - Issue #23804: Fix SSL zero-length recv() calls to not block and not raise
an error about unclean EOF. an error about unclean EOF.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment