Merge

2 files changed, 113 insertions, 128 deletions

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 4eab318..1e6a05a 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1151,12 +1151,7 @@ def _setup(sys_module, _imp_module):
 
 
 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 9c531f0..292308f 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -2265,8 +2265,8 @@ unsigned char _Py_M__importlib[] = {
     32,99,1,0,0,0,0,0,0,0,1,0,0,0,4,0,
     0,0,19,0,0,0,115,46,0,0,0,116,0,0,124,0,
     0,131,1,0,115,33,0,116,1,0,100,1,0,100,2,0,
-    124,0,0,131,1,1,130,1,0,110,0,0,136,1,0,124,
-    0,0,136,0,0,140,1,0,83,40,3,0,0,0,117,45,
+    124,0,0,131,1,1,130,1,0,110,0,0,136,0,0,124,
+    0,0,136,1,0,140,1,0,83,40,3,0,0,0,117,45,
     0,0,0,80,97,116,104,32,104,111,111,107,32,102,111,114,
     32,105,109,112,111,114,116,108,105,98,46,109,97,99,104,105,
     110,101,114,121,46,70,105,108,101,70,105,110,100,101,114,46,
@@ -2276,8 +2276,8 @@ unsigned char _Py_M__importlib[] = {
     0,117,11,0,0,0,95,112,97,116,104,95,105,115,100,105,
     114,117,11,0,0,0,73,109,112,111,114,116,69,114,114,111,
     114,40,1,0,0,0,117,4,0,0,0,112,97,116,104,40,
-    2,0,0,0,117,14,0,0,0,108,111,97,100,101,114,95,
-    100,101,116,97,105,108,115,117,3,0,0,0,99,108,115,40,
+    2,0,0,0,117,3,0,0,0,99,108,115,117,14,0,0,
+    0,108,111,97,100,101,114,95,100,101,116,97,105,108,115,40,
     0,0,0,0,117,29,0,0,0,60,102,114,111,122,101,110,
     32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116,
     115,116,114,97,112,62,117,24,0,0,0,112,97,116,104,95,
@@ -2291,9 +2291,9 @@ unsigned char _Py_M__importlib[] = {
     14,0,0,0,108,111,97,100,101,114,95,100,101,116,97,105,
     108,115,117,24,0,0,0,112,97,116,104,95,104,111,111,107,
     95,102,111,114,95,70,105,108,101,70,105,110,100,101,114,40,
-    0,0,0,0,40,2,0,0,0,117,14,0,0,0,108,111,
-    97,100,101,114,95,100,101,116,97,105,108,115,117,3,0,0,
-    0,99,108,115,117,29,0,0,0,60,102,114,111,122,101,110,
+    0,0,0,0,40,2,0,0,0,117,3,0,0,0,99,108,
+    115,117,14,0,0,0,108,111,97,100,101,114,95,100,101,116,
+    97,105,108,115,117,29,0,0,0,60,102,114,111,122,101,110,
     32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116,
     115,116,114,97,112,62,117,9,0,0,0,112,97,116,104,95,
     104,111,111,107,108,3,0,0,115,4,0,0,0,0,10,21,
@@ -2897,124 +2897,114 @@ unsigned char _Py_M__importlib[] = {
     116,9,0,106,10,0,106,11,0,116,12,0,106,13,0,124,
     5,0,140,0,0,103,1,0,131,1,0,1,116,9,0,106,
     14,0,106,11,0,116,15,0,116,16,0,116,17,0,103,3,
-    0,131,1,0,1,100,1,0,83,40,4,0,0,0,117,202,
+    0,131,1,0,1,100,1,0,83,40,4,0,0,0,117,50,
     0,0,0,73,110,115,116,97,108,108,32,105,109,112,111,114,
     116,108,105,98,32,97,115,32,116,104,101,32,105,109,112,108,
     101,109,101,110,116,97,116,105,111,110,32,111,102,32,105,109,
-    112,111,114,116,46,10,10,32,32,32,32,73,116,32,105,115,
-    32,97,115,115,117,109,101,100,32,116,104,97,116,32,95,105,
-    109,112,32,97,110,100,32,115,121,115,32,104,97,118,101,32,
-    98,101,101,110,32,105,109,112,111,114,116,101,100,32,97,110,
-    100,32,105,110,106,101,99,116,101,100,32,105,110,116,111,32,
-    116,104,101,10,32,32,32,32,103,108,111,98,97,108,32,110,
-    97,109,101,115,112,97,99,101,32,102,111,114,32,116,104,101,
-    32,109,111,100,117,108,101,32,112,114,105,111,114,32,116,111,
-    32,99,97,108,108,105,110,103,32,116,104,105,115,32,102,117,
-    110,99,116,105,111,110,46,10,10,32,32,32,32,78,70,84,
-    40,18,0,0,0,117,6,0,0,0,95,115,101,116,117,112,
-    117,19,0,0,0,69,120,116,101,110,115,105,111,110,70,105,
-    108,101,76,111,97,100,101,114,117,18,0,0,0,101,120,116,
-    101,110,115,105,111,110,95,115,117,102,102,105,120,101,115,117,
-    5,0,0,0,70,97,108,115,101,117,16,0,0,0,83,111,
-    117,114,99,101,70,105,108,101,76,111,97,100,101,114,117,16,
-    0,0,0,95,83,79,85,82,67,69,95,83,85,70,70,73,
-    88,69,83,117,4,0,0,0,84,114,117,101,117,20,0,0,
-    0,83,111,117,114,99,101,108,101,115,115,70,105,108,101,76,
-    111,97,100,101,114,117,16,0,0,0,95,66,89,84,69,67,
-    79,68,69,95,83,85,70,70,73,88,117,3,0,0,0,115,
-    121,115,117,10,0,0,0,112,97,116,104,95,104,111,111,107,
-    115,117,6,0,0,0,101,120,116,101,110,100,117,10,0,0,
-    0,70,105,108,101,70,105,110,100,101,114,117,9,0,0,0,
-    112,97,116,104,95,104,111,111,107,117,9,0,0,0,109,101,
-    116,97,95,112,97,116,104,117,15,0,0,0,66,117,105,108,
-    116,105,110,73,109,112,111,114,116,101,114,117,14,0,0,0,
-    70,114,111,122,101,110,73,109,112,111,114,116,101,114,117,10,
-    0,0,0,80,97,116,104,70,105,110,100,101,114,40,6,0,
-    0,0,117,10,0,0,0,115,121,115,95,109,111,100,117,108,
-    101,117,11,0,0,0,95,105,109,112,95,109,111,100,117,108,
-    101,117,10,0,0,0,101,120,116,101,110,115,105,111,110,115,
-    117,6,0,0,0,115,111,117,114,99,101,117,8,0,0,0,
-    98,121,116,101,99,111,100,101,117,17,0,0,0,115,117,112,
-    112,111,114,116,101,100,95,108,111,97,100,101,114,115,40,0,
-    0,0,0,40,0,0,0,0,117,29,0,0,0,60,102,114,
-    111,122,101,110,32,105,109,112,111,114,116,108,105,98,46,95,
-    98,111,111,116,115,116,114,97,112,62,117,8,0,0,0,95,
-    105,110,115,116,97,108,108,129,4,0,0,115,14,0,0,0,
-    0,7,13,1,21,1,15,1,18,1,15,1,28,1,117,8,
-    0,0,0,95,105,110,115,116,97,108,108,78,40,3,0,0,
-    0,117,3,0,0,0,119,105,110,117,6,0,0,0,99,121,
-    103,119,105,110,117,6,0,0,0,100,97,114,119,105,110,40,
-    55,0,0,0,117,7,0,0,0,95,95,100,111,99,95,95,
-    117,27,0,0,0,95,67,65,83,69,95,73,78,83,69,78,
-    83,73,84,73,86,69,95,80,76,65,84,70,79,82,77,83,
-    117,16,0,0,0,95,109,97,107,101,95,114,101,108,97,120,
-    95,99,97,115,101,117,7,0,0,0,95,119,95,108,111,110,
-    103,117,7,0,0,0,95,114,95,108,111,110,103,117,10,0,
-    0,0,95,112,97,116,104,95,106,111,105,110,117,11,0,0,
-    0,95,112,97,116,104,95,115,112,108,105,116,117,18,0,0,
-    0,95,112,97,116,104,95,105,115,95,109,111,100,101,95,116,
-    121,112,101,117,12,0,0,0,95,112,97,116,104,95,105,115,
-    102,105,108,101,117,11,0,0,0,95,112,97,116,104,95,105,
-    115,100,105,114,117,13,0,0,0,95,119,114,105,116,101,95,
-    97,116,111,109,105,99,117,5,0,0,0,95,119,114,97,112,
-    117,4,0,0,0,116,121,112,101,117,8,0,0,0,95,95,
-    99,111,100,101,95,95,117,10,0,0,0,95,99,111,100,101,
-    95,116,121,112,101,117,10,0,0,0,110,101,119,95,109,111,
-    100,117,108,101,117,8,0,0,0,95,80,89,67,65,67,72,
-    69,117,16,0,0,0,95,83,79,85,82,67,69,95,83,85,
-    70,70,73,88,69,83,117,22,0,0,0,95,68,69,66,85,
-    71,95,66,89,84,69,67,79,68,69,95,83,85,70,70,73,
-    88,117,20,0,0,0,95,79,80,84,95,66,89,84,69,67,
-    79,68,69,95,83,85,70,70,73,88,117,9,0,0,0,95,
-    95,100,101,98,117,103,95,95,117,16,0,0,0,95,66,89,
-    84,69,67,79,68,69,95,83,85,70,70,73,88,117,4,0,
-    0,0,78,111,110,101,117,17,0,0,0,99,97,99,104,101,
-    95,102,114,111,109,95,115,111,117,114,99,101,117,16,0,0,
-    0,95,118,101,114,98,111,115,101,95,109,101,115,115,97,103,
-    101,117,11,0,0,0,115,101,116,95,112,97,99,107,97,103,
-    101,117,10,0,0,0,115,101,116,95,108,111,97,100,101,114,
-    117,17,0,0,0,109,111,100,117,108,101,95,102,111,114,95,
-    108,111,97,100,101,114,117,11,0,0,0,95,99,104,101,99,
-    107,95,110,97,109,101,117,17,0,0,0,95,114,101,113,117,
-    105,114,101,115,95,98,117,105,108,116,105,110,117,16,0,0,
-    0,95,114,101,113,117,105,114,101,115,95,102,114,111,122,101,
-    110,117,15,0,0,0,66,117,105,108,116,105,110,73,109,112,
-    111,114,116,101,114,117,14,0,0,0,70,114,111,122,101,110,
-    73,109,112,111,114,116,101,114,117,13,0,0,0,95,76,111,
-    97,100,101,114,66,97,115,105,99,115,117,12,0,0,0,83,
-    111,117,114,99,101,76,111,97,100,101,114,117,10,0,0,0,
-    70,105,108,101,76,111,97,100,101,114,117,16,0,0,0,83,
-    111,117,114,99,101,70,105,108,101,76,111,97,100,101,114,117,
-    20,0,0,0,83,111,117,114,99,101,108,101,115,115,70,105,
-    108,101,76,111,97,100,101,114,117,19,0,0,0,69,120,116,
+    112,111,114,116,46,78,70,84,40,18,0,0,0,117,6,0,
+    0,0,95,115,101,116,117,112,117,19,0,0,0,69,120,116,
     101,110,115,105,111,110,70,105,108,101,76,111,97,100,101,114,
-    117,10,0,0,0,80,97,116,104,70,105,110,100,101,114,117,
-    10,0,0,0,70,105,108,101,70,105,110,100,101,114,117,18,
-    0,0,0,95,73,109,112,111,114,116,76,111,99,107,67,111,
-    110,116,101,120,116,117,13,0,0,0,95,114,101,115,111,108,
-    118,101,95,110,97,109,101,117,12,0,0,0,95,102,105,110,
-    100,95,109,111,100,117,108,101,117,13,0,0,0,95,115,97,
-    110,105,116,121,95,99,104,101,99,107,117,8,0,0,0,95,
-    69,82,82,95,77,83,71,117,14,0,0,0,95,102,105,110,
-    100,95,97,110,100,95,108,111,97,100,117,11,0,0,0,95,
-    103,99,100,95,105,109,112,111,114,116,117,16,0,0,0,95,
-    104,97,110,100,108,101,95,102,114,111,109,108,105,115,116,117,
-    17,0,0,0,95,99,97,108,99,95,95,95,112,97,99,107,
-    97,103,101,95,95,117,10,0,0,0,95,95,105,109,112,111,
-    114,116,95,95,117,13,0,0,0,95,77,65,71,73,67,95,
-    78,85,77,66,69,82,117,4,0,0,0,95,84,65,71,117,
-    6,0,0,0,95,115,101,116,117,112,117,8,0,0,0,95,
-    105,110,115,116,97,108,108,40,0,0,0,0,40,0,0,0,
-    0,40,0,0,0,0,117,29,0,0,0,60,102,114,111,122,
-    101,110,32,105,109,112,111,114,116,108,105,98,46,95,98,111,
-    111,116,115,116,114,97,112,62,117,8,0,0,0,60,109,111,
-    100,117,108,101,62,8,0,0,0,115,100,0,0,0,6,21,
-    6,3,12,13,12,16,12,13,12,12,12,12,12,10,12,6,
-    12,7,12,21,12,8,15,3,12,11,6,2,9,2,6,1,
-    6,1,18,2,15,19,12,8,12,13,12,11,12,48,12,16,
-    12,11,12,13,19,53,19,47,19,77,22,111,19,22,25,38,
-    25,24,19,45,19,54,19,116,19,13,12,9,12,16,12,17,
-    6,2,12,47,18,25,12,23,12,15,24,30,6,1,6,3,
-    12,54,
+    117,18,0,0,0,101,120,116,101,110,115,105,111,110,95,115,
+    117,102,102,105,120,101,115,117,5,0,0,0,70,97,108,115,
+    101,117,16,0,0,0,83,111,117,114,99,101,70,105,108,101,
+    76,111,97,100,101,114,117,16,0,0,0,95,83,79,85,82,
+    67,69,95,83,85,70,70,73,88,69,83,117,4,0,0,0,
+    84,114,117,101,117,20,0,0,0,83,111,117,114,99,101,108,
+    101,115,115,70,105,108,101,76,111,97,100,101,114,117,16,0,
+    0,0,95,66,89,84,69,67,79,68,69,95,83,85,70,70,
+    73,88,117,3,0,0,0,115,121,115,117,10,0,0,0,112,
+    97,116,104,95,104,111,111,107,115,117,6,0,0,0,101,120,
+    116,101,110,100,117,10,0,0,0,70,105,108,101,70,105,110,
+    100,101,114,117,9,0,0,0,112,97,116,104,95,104,111,111,
+    107,117,9,0,0,0,109,101,116,97,95,112,97,116,104,117,
+    15,0,0,0,66,117,105,108,116,105,110,73,109,112,111,114,
+    116,101,114,117,14,0,0,0,70,114,111,122,101,110,73,109,
+    112,111,114,116,101,114,117,10,0,0,0,80,97,116,104,70,
+    105,110,100,101,114,40,6,0,0,0,117,10,0,0,0,115,
+    121,115,95,109,111,100,117,108,101,117,11,0,0,0,95,105,
+    109,112,95,109,111,100,117,108,101,117,10,0,0,0,101,120,
+    116,101,110,115,105,111,110,115,117,6,0,0,0,115,111,117,
+    114,99,101,117,8,0,0,0,98,121,116,101,99,111,100,101,
+    117,17,0,0,0,115,117,112,112,111,114,116,101,100,95,108,
+    111,97,100,101,114,115,40,0,0,0,0,40,0,0,0,0,
+    117,29,0,0,0,60,102,114,111,122,101,110,32,105,109,112,
+    111,114,116,108,105,98,46,95,98,111,111,116,115,116,114,97,
+    112,62,117,8,0,0,0,95,105,110,115,116,97,108,108,129,
+    4,0,0,115,14,0,0,0,0,2,13,1,21,1,15,1,
+    18,1,15,1,28,1,117,8,0,0,0,95,105,110,115,116,
+    97,108,108,78,40,3,0,0,0,117,3,0,0,0,119,105,
+    110,117,6,0,0,0,99,121,103,119,105,110,117,6,0,0,
+    0,100,97,114,119,105,110,40,55,0,0,0,117,7,0,0,
+    0,95,95,100,111,99,95,95,117,27,0,0,0,95,67,65,
+    83,69,95,73,78,83,69,78,83,73,84,73,86,69,95,80,
+    76,65,84,70,79,82,77,83,117,16,0,0,0,95,109,97,
+    107,101,95,114,101,108,97,120,95,99,97,115,101,117,7,0,
+    0,0,95,119,95,108,111,110,103,117,7,0,0,0,95,114,
+    95,108,111,110,103,117,10,0,0,0,95,112,97,116,104,95,
+    106,111,105,110,117,11,0,0,0,95,112,97,116,104,95,115,
+    112,108,105,116,117,18,0,0,0,95,112,97,116,104,95,105,
+    115,95,109,111,100,101,95,116,121,112,101,117,12,0,0,0,
+    95,112,97,116,104,95,105,115,102,105,108,101,117,11,0,0,
+    0,95,112,97,116,104,95,105,115,100,105,114,117,13,0,0,
+    0,95,119,114,105,116,101,95,97,116,111,109,105,99,117,5,
+    0,0,0,95,119,114,97,112,117,4,0,0,0,116,121,112,
+    101,117,8,0,0,0,95,95,99,111,100,101,95,95,117,10,
+    0,0,0,95,99,111,100,101,95,116,121,112,101,117,10,0,
+    0,0,110,101,119,95,109,111,100,117,108,101,117,8,0,0,
+    0,95,80,89,67,65,67,72,69,117,16,0,0,0,95,83,
+    79,85,82,67,69,95,83,85,70,70,73,88,69,83,117,22,
+    0,0,0,95,68,69,66,85,71,95,66,89,84,69,67,79,
+    68,69,95,83,85,70,70,73,88,117,20,0,0,0,95,79,
+    80,84,95,66,89,84,69,67,79,68,69,95,83,85,70,70,
+    73,88,117,9,0,0,0,95,95,100,101,98,117,103,95,95,
+    117,16,0,0,0,95,66,89,84,69,67,79,68,69,95,83,
+    85,70,70,73,88,117,4,0,0,0,78,111,110,101,117,17,
+    0,0,0,99,97,99,104,101,95,102,114,111,109,95,115,111,
+    117,114,99,101,117,16,0,0,0,95,118,101,114,98,111,115,
+    101,95,109,101,115,115,97,103,101,117,11,0,0,0,115,101,
+    116,95,112,97,99,107,97,103,101,117,10,0,0,0,115,101,
+    116,95,108,111,97,100,101,114,117,17,0,0,0,109,111,100,
+    117,108,101,95,102,111,114,95,108,111,97,100,101,114,117,11,
+    0,0,0,95,99,104,101,99,107,95,110,97,109,101,117,17,
+    0,0,0,95,114,101,113,117,105,114,101,115,95,98,117,105,
+    108,116,105,110,117,16,0,0,0,95,114,101,113,117,105,114,
+    101,115,95,102,114,111,122,101,110,117,15,0,0,0,66,117,
+    105,108,116,105,110,73,109,112,111,114,116,101,114,117,14,0,
+    0,0,70,114,111,122,101,110,73,109,112,111,114,116,101,114,
+    117,13,0,0,0,95,76,111,97,100,101,114,66,97,115,105,
+    99,115,117,12,0,0,0,83,111,117,114,99,101,76,111,97,
+    100,101,114,117,10,0,0,0,70,105,108,101,76,111,97,100,
+    101,114,117,16,0,0,0,83,111,117,114,99,101,70,105,108,
+    101,76,111,97,100,101,114,117,20,0,0,0,83,111,117,114,
+    99,101,108,101,115,115,70,105,108,101,76,111,97,100,101,114,
+    117,19,0,0,0,69,120,116,101,110,115,105,111,110,70,105,
+    108,101,76,111,97,100,101,114,117,10,0,0,0,80,97,116,
+    104,70,105,110,100,101,114,117,10,0,0,0,70,105,108,101,
+    70,105,110,100,101,114,117,18,0,0,0,95,73,109,112,111,
+    114,116,76,111,99,107,67,111,110,116,101,120,116,117,13,0,
+    0,0,95,114,101,115,111,108,118,101,95,110,97,109,101,117,
+    12,0,0,0,95,102,105,110,100,95,109,111,100,117,108,101,
+    117,13,0,0,0,95,115,97,110,105,116,121,95,99,104,101,
+    99,107,117,8,0,0,0,95,69,82,82,95,77,83,71,117,
+    14,0,0,0,95,102,105,110,100,95,97,110,100,95,108,111,
+    97,100,117,11,0,0,0,95,103,99,100,95,105,109,112,111,
+    114,116,117,16,0,0,0,95,104,97,110,100,108,101,95,102,
+    114,111,109,108,105,115,116,117,17,0,0,0,95,99,97,108,
+    99,95,95,95,112,97,99,107,97,103,101,95,95,117,10,0,
+    0,0,95,95,105,109,112,111,114,116,95,95,117,13,0,0,
+    0,95,77,65,71,73,67,95,78,85,77,66,69,82,117,4,
+    0,0,0,95,84,65,71,117,6,0,0,0,95,115,101,116,
+    117,112,117,8,0,0,0,95,105,110,115,116,97,108,108,40,
+    0,0,0,0,40,0,0,0,0,40,0,0,0,0,117,29,
+    0,0,0,60,102,114,111,122,101,110,32,105,109,112,111,114,
+    116,108,105,98,46,95,98,111,111,116,115,116,114,97,112,62,
+    117,8,0,0,0,60,109,111,100,117,108,101,62,8,0,0,
+    0,115,100,0,0,0,6,21,6,3,12,13,12,16,12,13,
+    12,12,12,12,12,10,12,6,12,7,12,21,12,8,15,3,
+    12,11,6,2,9,2,6,1,6,1,18,2,15,19,12,8,
+    12,13,12,11,12,48,12,16,12,11,12,13,19,53,19,47,
+    19,77,22,111,19,22,25,38,25,24,19,45,19,54,19,116,
+    19,13,12,9,12,16,12,17,6,2,12,47,18,25,12,23,
+    12,15,24,30,6,1,6,3,12,54,
 };
 /* Mercurial binary marker: