[Python-checkins] cpython (merge 3.3 -> default): Merge doc/argument name fix

[brett.cannon]

http://hg.python.org/cpython/rev/03ad17618ac4
changeset:   84176:03ad17618ac4
parent:      84173:bdd60bedf933
parent:      84175:e7ab65cf1e2a
user:        Brett Cannon <brett at python.org>
date:        Sun Jun 16 19:09:46 2013 -0400
summary:
  Merge doc/argument name fix

files:
  Doc/library/importlib.rst   |  2 +-
  Lib/importlib/_bootstrap.py |  4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -751,7 +751,7 @@
 
       The path the finder will search in.
 
-   .. method:: find_module(fullname)
+   .. method:: find_loader(fullname)
 
       Attempt to find the loader to handle *fullname* within :attr:`path`.
 
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1361,12 +1361,12 @@
 
     """
 
-    def __init__(self, path, *details):
+    def __init__(self, path, *loader_details):
         """Initialize with the path to search on and a variable number of
         2-tuples containing the loader and the file suffixes the loader
         recognizes."""
         loaders = []
-        for loader, suffixes in details:
+        for loader, suffixes in loader_details:
             loaders.extend((suffix, loader) for suffix in suffixes)
         self._loaders = loaders
         # Base (directory) path

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