[Python-checkins] cpython: Fix a parameter name to make sense again

brett.cannon python-checkins at python.org
Fri May 30 22:28:09 CEST 2014


http://hg.python.org/cpython/rev/98475e024344
changeset:   90919:98475e024344
user:        Brett Cannon <brett at python.org>
date:        Fri May 30 16:28:00 2014 -0400
summary:
  Fix a parameter name to make sense again

files:
  Lib/importlib/_bootstrap.py |     5 +-
  Python/importlib.h          |  6378 +++++++++++-----------
  2 files changed, 3192 insertions(+), 3191 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -581,13 +581,14 @@
     return loader
 
 
-def _load_module_shim(spec, fullname):
+# Typically used by loader classes as a method replacement.
+def _load_module_shim(self, fullname):
     """Load the specified module into sys.modules and return it.
 
     This method is deprecated.  Use loader.exec_module instead.
 
     """
-    spec = spec_from_loader(fullname, spec)
+    spec = spec_from_loader(fullname, self)
     if fullname in sys.modules:
         module = sys.modules[fullname]
         _exec(spec, module)
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


More information about the Python-checkins mailing list