Commit efbc4752 authored by Eric Snow's avatar Eric Snow

[issue19151] Fix docstring and use of _get_suppported_file_loaders() to reflect 2-tuples.

parent 60b18340
...@@ -781,7 +781,7 @@ class WindowsRegistryFinder: ...@@ -781,7 +781,7 @@ class WindowsRegistryFinder:
_os.stat(filepath) _os.stat(filepath)
except OSError: except OSError:
return None return None
for loader, suffixes, _ in _get_supported_file_loaders(): for loader, suffixes in _get_supported_file_loaders():
if filepath.endswith(tuple(suffixes)): if filepath.endswith(tuple(suffixes)):
return loader(fullname, filepath) return loader(fullname, filepath)
...@@ -1643,7 +1643,7 @@ def _calc___package__(globals): ...@@ -1643,7 +1643,7 @@ def _calc___package__(globals):
def _get_supported_file_loaders(): def _get_supported_file_loaders():
"""Returns a list of file-based module loaders. """Returns a list of file-based module loaders.
Each item is a tuple (loader, suffixes, allow_packages). Each item is a tuple (loader, suffixes).
""" """
extensions = ExtensionFileLoader, _imp.extension_suffixes() extensions = ExtensionFileLoader, _imp.extension_suffixes()
source = SourceFileLoader, SOURCE_SUFFIXES source = SourceFileLoader, SOURCE_SUFFIXES
......
...@@ -203,6 +203,9 @@ Library ...@@ -203,6 +203,9 @@ Library
- Issue #18405: Improve the entropy of crypt.mksalt(). - Issue #18405: Improve the entropy of crypt.mksalt().
- Issue #19151: Fix docstring and use of _get_suppported_file_loaders() to
reflect 2-tuples.
- Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get - Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get
docstrings and ValueError messages. Patch by Zhongyue Luo docstrings and ValueError messages. Patch by Zhongyue Luo
......
This diff is collapsed.
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