[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/57cbffae4f74
changeset:   76767:57cbffae4f74
parent:      76766:66ccd993dfdf
parent:      76765:146001e3364d
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri May 04 23:17:03 2012 +0200
summary:
  Merge

files:
  Lib/importlib/_bootstrap.py |    7 +------
  Python/importlib.h          |  Bin 
  2 files changed, 1 insertions(+), 6 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1151,12 +1151,7 @@
 
 
 def _install(sys_module, _imp_module):
-    """Install importlib as the implementation of import.
-
-    It is assumed that _imp and sys have been imported and injected into the
-    global namespace for the module prior to calling this function.
-
-    """
+    """Install importlib as the implementation of import."""
     _setup(sys_module, _imp_module)
     extensions = ExtensionFileLoader, _imp_module.extension_suffixes(), False
     source = SourceFileLoader, _SOURCE_SUFFIXES, True
diff --git a/Python/importlib.h b/Python/importlib.h
index 9c531f013f45b202d3523994af2799d4270339a7..292308fc78123e9fa10c7131bb110c47559975dd
GIT binary patch
[stripped]

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