diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -1418,8 +1418,3 @@ if _os.__name__ == 'nt': sys.meta_path.append(WindowsRegistryFinder) sys.meta_path.append(PathFinder) - - # XXX We expose a couple of classes in _bootstrap for the sake of - # a setuptools bug (https://bitbucket.org/pypa/setuptools/issue/378). - _bootstrap_module.FileFinder = FileFinder - _bootstrap_module.SourceFileLoader = SourceFileLoader diff --git a/Python/importlib_external.h b/Python/importlib_external.h --- a/Python/importlib_external.h +++ b/Python/importlib_external.h @@ -2540,57 +2540,55 @@ 11,1,16,3,15,1,16,3,12,1,15,1,16,3,19,1, 19,1,12,1,13,1,12,1,114,33,1,0,0,99,1,0, 0,0,0,0,0,0,2,0,0,0,3,0,0,0,67,0, - 0,0,115,116,0,0,0,116,0,0,124,0,0,131,1,0, + 0,0,115,98,0,0,0,116,0,0,124,0,0,131,1,0, 1,116,1,0,131,0,0,125,1,0,116,2,0,106,3,0, 106,4,0,116,5,0,106,6,0,124,1,0,140,0,0,103, 1,0,131,1,0,1,116,7,0,106,8,0,100,1,0,107, 2,0,114,78,0,116,2,0,106,9,0,106,10,0,116,11, 0,131,1,0,1,116,2,0,106,9,0,106,10,0,116,12, - 0,131,1,0,1,116,5,0,124,0,0,95,5,0,116,13, - 0,124,0,0,95,13,0,100,2,0,83,41,3,122,41,73, - 110,115,116,97,108,108,32,116,104,101,32,112,97,116,104,45, - 98,97,115,101,100,32,105,109,112,111,114,116,32,99,111,109, - 112,111,110,101,110,116,115,46,114,28,1,0,0,78,41,14, - 114,33,1,0,0,114,161,0,0,0,114,7,0,0,0,114, - 254,0,0,0,114,149,0,0,0,114,6,1,0,0,114,19, - 1,0,0,114,3,0,0,0,114,112,0,0,0,218,9,109, - 101,116,97,95,112,97,116,104,114,163,0,0,0,114,168,0, - 0,0,114,249,0,0,0,114,218,0,0,0,41,2,114,32, - 1,0,0,90,17,115,117,112,112,111,114,116,101,100,95,108, - 111,97,100,101,114,115,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,218,8,95,105,110,115,116,97,108,108,133, - 5,0,0,115,16,0,0,0,0,2,10,1,9,1,28,1, - 15,1,16,1,16,4,9,1,114,35,1,0,0,41,3,122, - 3,119,105,110,114,1,0,0,0,114,2,0,0,0,41,57, - 114,114,0,0,0,114,10,0,0,0,114,11,0,0,0,114, - 17,0,0,0,114,19,0,0,0,114,28,0,0,0,114,38, - 0,0,0,114,39,0,0,0,114,43,0,0,0,114,44,0, - 0,0,114,46,0,0,0,114,55,0,0,0,218,4,116,121, - 112,101,218,8,95,95,99,111,100,101,95,95,114,144,0,0, - 0,114,15,0,0,0,114,135,0,0,0,114,14,0,0,0, - 114,18,0,0,0,90,17,95,82,65,87,95,77,65,71,73, - 67,95,78,85,77,66,69,82,114,73,0,0,0,114,72,0, - 0,0,114,84,0,0,0,114,74,0,0,0,90,23,68,69, - 66,85,71,95,66,89,84,69,67,79,68,69,95,83,85,70, - 70,73,88,69,83,90,27,79,80,84,73,77,73,90,69,68, - 95,66,89,84,69,67,79,68,69,95,83,85,70,70,73,88, - 69,83,114,79,0,0,0,114,85,0,0,0,114,91,0,0, - 0,114,95,0,0,0,114,97,0,0,0,114,105,0,0,0, - 114,123,0,0,0,114,130,0,0,0,114,141,0,0,0,114, - 147,0,0,0,114,150,0,0,0,114,155,0,0,0,218,6, - 111,98,106,101,99,116,114,162,0,0,0,114,167,0,0,0, - 114,168,0,0,0,114,184,0,0,0,114,194,0,0,0,114, - 210,0,0,0,114,218,0,0,0,114,223,0,0,0,114,229, - 0,0,0,114,224,0,0,0,114,230,0,0,0,114,247,0, - 0,0,114,249,0,0,0,114,6,1,0,0,114,24,1,0, - 0,114,161,0,0,0,114,33,1,0,0,114,35,1,0,0, - 114,4,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,218,8,60,109,111,100,117,108,101,62,8,0, - 0,0,115,100,0,0,0,6,17,6,3,12,12,12,5,12, - 5,12,6,12,12,12,10,12,9,12,5,12,7,15,22,15, - 109,22,1,18,2,6,1,6,2,9,2,9,2,10,2,21, - 44,12,33,12,19,12,12,12,12,18,8,12,28,12,17,21, - 55,21,12,18,10,12,14,9,3,12,1,15,65,19,64,19, - 28,22,110,19,41,25,43,25,16,6,3,25,53,19,57,19, - 41,19,134,19,146,15,23,12,11,12,68, + 0,131,1,0,1,100,2,0,83,41,3,122,41,73,110,115, + 116,97,108,108,32,116,104,101,32,112,97,116,104,45,98,97, + 115,101,100,32,105,109,112,111,114,116,32,99,111,109,112,111, + 110,101,110,116,115,46,114,28,1,0,0,78,41,13,114,33, + 1,0,0,114,161,0,0,0,114,7,0,0,0,114,254,0, + 0,0,114,149,0,0,0,114,6,1,0,0,114,19,1,0, + 0,114,3,0,0,0,114,112,0,0,0,218,9,109,101,116, + 97,95,112,97,116,104,114,163,0,0,0,114,168,0,0,0, + 114,249,0,0,0,41,2,114,32,1,0,0,90,17,115,117, + 112,112,111,114,116,101,100,95,108,111,97,100,101,114,115,114, + 4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,8, + 95,105,110,115,116,97,108,108,133,5,0,0,115,12,0,0, + 0,0,2,10,1,9,1,28,1,15,1,16,1,114,35,1, + 0,0,41,3,122,3,119,105,110,114,1,0,0,0,114,2, + 0,0,0,41,57,114,114,0,0,0,114,10,0,0,0,114, + 11,0,0,0,114,17,0,0,0,114,19,0,0,0,114,28, + 0,0,0,114,38,0,0,0,114,39,0,0,0,114,43,0, + 0,0,114,44,0,0,0,114,46,0,0,0,114,55,0,0, + 0,218,4,116,121,112,101,218,8,95,95,99,111,100,101,95, + 95,114,144,0,0,0,114,15,0,0,0,114,135,0,0,0, + 114,14,0,0,0,114,18,0,0,0,90,17,95,82,65,87, + 95,77,65,71,73,67,95,78,85,77,66,69,82,114,73,0, + 0,0,114,72,0,0,0,114,84,0,0,0,114,74,0,0, + 0,90,23,68,69,66,85,71,95,66,89,84,69,67,79,68, + 69,95,83,85,70,70,73,88,69,83,90,27,79,80,84,73, + 77,73,90,69,68,95,66,89,84,69,67,79,68,69,95,83, + 85,70,70,73,88,69,83,114,79,0,0,0,114,85,0,0, + 0,114,91,0,0,0,114,95,0,0,0,114,97,0,0,0, + 114,105,0,0,0,114,123,0,0,0,114,130,0,0,0,114, + 141,0,0,0,114,147,0,0,0,114,150,0,0,0,114,155, + 0,0,0,218,6,111,98,106,101,99,116,114,162,0,0,0, + 114,167,0,0,0,114,168,0,0,0,114,184,0,0,0,114, + 194,0,0,0,114,210,0,0,0,114,218,0,0,0,114,223, + 0,0,0,114,229,0,0,0,114,224,0,0,0,114,230,0, + 0,0,114,247,0,0,0,114,249,0,0,0,114,6,1,0, + 0,114,24,1,0,0,114,161,0,0,0,114,33,1,0,0, + 114,35,1,0,0,114,4,0,0,0,114,4,0,0,0,114, + 4,0,0,0,114,5,0,0,0,218,8,60,109,111,100,117, + 108,101,62,8,0,0,0,115,100,0,0,0,6,17,6,3, + 12,12,12,5,12,5,12,6,12,12,12,10,12,9,12,5, + 12,7,15,22,15,109,22,1,18,2,6,1,6,2,9,2, + 9,2,10,2,21,44,12,33,12,19,12,12,12,12,18,8, + 12,28,12,17,21,55,21,12,18,10,12,14,9,3,12,1, + 15,65,19,64,19,28,22,110,19,41,25,43,25,16,6,3, + 25,53,19,57,19,41,19,134,19,146,15,23,12,11,12,68, };