mirror of
https://github.com/python/cpython.git
synced 2025-12-23 09:19:18 +00:00
Merge for #26844
This commit is contained in:
commit
896e87a99c
3 changed files with 6 additions and 2 deletions
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -949,6 +949,7 @@ Graham Matthews
|
|||
mattip
|
||||
Martin Matusiak
|
||||
Dieter Maurer
|
||||
Lev Maximov
|
||||
Daniel May
|
||||
Madison May
|
||||
Lucas Maystre
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue