[Python-checkins] cpython: [issue19951] Fix docstring and use of _get_suppported_file_loaders() to reflect

[eric.snow]

http://hg.python.org/cpython/rev/152f72356670
changeset:   85941:152f72356670
user:        Eric Snow <ericsnowcurrently at gmail.com>
date:        Thu Oct 03 12:08:55 2013 -0600
summary:
  [issue19951] Fix docstring and use of _get_suppported_file_loaders() to reflect 2-tuples.

files:
  Lib/importlib/_bootstrap.py |     4 +-
  Misc/NEWS                   |     3 +
  Python/importlib.h          |  3862 +++++++++++-----------
  3 files changed, 1935 insertions(+), 1934 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -881,7 +881,7 @@
             _os.stat(filepath)
         except OSError:
             return None
-        for loader, suffixes, _ in _get_supported_file_loaders():
+        for loader, suffixes in _get_supported_file_loaders():
             if filepath.endswith(tuple(suffixes)):
                 return loader(fullname, filepath)
 
@@ -1670,7 +1670,7 @@
 def _get_supported_file_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()
     source = SourceFileLoader, SOURCE_SUFFIXES
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -358,6 +358,9 @@
 - Issue #18598: Tweak exception message for importlib.import_module() to
   include the module name when a key argument is missing.
 
+- Issue #19951: 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
   docstrings and ValueError messages. Patch by Zhongyue Luo
 
diff --git a/Python/importlib.h b/Python/importlib.h
--- a/Python/importlib.h
+++ b/Python/importlib.h
[stripped]

-- 
Repository URL: http://hg.python.org/cpython