Skip to content

Commit 50fd898

Browse files
ericsnowcurrentlyericsnowcurrently
committed
Issue #24320: Drop an old setuptools-induced hack.
1 parent 9539963 commit 50fd898

File tree

2 files changed

+52
-58
lines changed

2 files changed

+52
-58
lines changed

‎Lib/importlib/_bootstrap_external.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,8 +1440,3 @@ def _install(_bootstrap_module):
14401440
if _os.__name__ == 'nt':
14411441
sys.meta_path.append(WindowsRegistryFinder)
14421442
sys.meta_path.append(PathFinder)
1443-
1444-
# XXX We expose a couple of classes in _bootstrap for the sake of
1445-
# a setuptools bug (https://bitbucket.org/pypa/setuptools/issue/378).
1446-
_bootstrap_module.FileFinder = FileFinder
1447-
_bootstrap_module.SourceFileLoader = SourceFileLoader

‎Python/importlib_external.h

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2380,61 +2380,60 @@ const unsigned char _Py_M__importlib_external[] = {
23802380
18,3,2,1,14,1,16,2,10,1,12,3,10,1,12,3,
23812381
10,1,10,1,12,3,14,1,14,1,10,1,10,1,10,1,
23822382
114,32,1,0,0,99,1,0,0,0,0,0,0,0,2,0,
2383-
0,0,3,0,0,0,67,0,0,0,115,86,0,0,0,116,
2383+
0,0,3,0,0,0,67,0,0,0,115,74,0,0,0,116,
23842384
0,124,0,131,1,1,0,116,1,131,0,125,1,116,2,106,
23852385
3,106,4,116,5,106,6,124,1,152,1,142,0,103,1,131,
23862386
1,1,0,116,7,106,8,100,1,107,2,114,58,116,2,106,
23872387
9,106,10,116,11,131,1,1,0,116,2,106,9,106,10,116,
2388-
12,131,1,1,0,116,5,124,0,95,5,116,13,124,0,95,
2389-
13,100,2,83,0,41,3,122,41,73,110,115,116,97,108,108,
2390-
32,116,104,101,32,112,97,116,104,45,98,97,115,101,100,32,
2391-
105,109,112,111,114,116,32,99,111,109,112,111,110,101,110,116,
2392-
115,46,114,27,1,0,0,78,41,14,114,32,1,0,0,114,
2393-
159,0,0,0,114,8,0,0,0,114,253,0,0,0,114,147,
2394-
0,0,0,114,5,1,0,0,114,18,1,0,0,114,3,0,
2395-
0,0,114,109,0,0,0,218,9,109,101,116,97,95,112,97,
2396-
116,104,114,161,0,0,0,114,166,0,0,0,114,248,0,0,
2397-
0,114,215,0,0,0,41,2,114,31,1,0,0,90,17,115,
2398-
117,112,112,111,114,116,101,100,95,108,111,97,100,101,114,115,
2399-
114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,
2400-
8,95,105,110,115,116,97,108,108,155,5,0,0,115,16,0,
2401-
0,0,0,2,8,1,6,1,22,1,10,1,12,1,12,4,
2402-
6,1,114,34,1,0,0,41,1,122,3,119,105,110,41,2,
2403-
114,1,0,0,0,114,2,0,0,0,41,1,114,49,0,0,
2404-
0,41,1,78,41,3,78,78,78,41,3,78,78,78,41,2,
2405-
114,62,0,0,0,114,62,0,0,0,41,1,78,41,1,78,
2406-
41,58,114,111,0,0,0,114,12,0,0,0,90,37,95,67,
2407-
65,83,69,95,73,78,83,69,78,83,73,84,73,86,69,95,
2408-
80,76,65,84,70,79,82,77,83,95,66,89,84,69,83,95,
2409-
75,69,89,114,11,0,0,0,114,13,0,0,0,114,19,0,
2410-
0,0,114,21,0,0,0,114,30,0,0,0,114,40,0,0,
2411-
0,114,41,0,0,0,114,45,0,0,0,114,46,0,0,0,
2412-
114,48,0,0,0,114,58,0,0,0,218,4,116,121,112,101,
2413-
218,8,95,95,99,111,100,101,95,95,114,142,0,0,0,114,
2414-
17,0,0,0,114,132,0,0,0,114,16,0,0,0,114,20,
2415-
0,0,0,90,17,95,82,65,87,95,77,65,71,73,67,95,
2416-
78,85,77,66,69,82,114,77,0,0,0,114,76,0,0,0,
2417-
114,88,0,0,0,114,78,0,0,0,90,23,68,69,66,85,
2418-
71,95,66,89,84,69,67,79,68,69,95,83,85,70,70,73,
2419-
88,69,83,90,27,79,80,84,73,77,73,90,69,68,95,66,
2420-
89,84,69,67,79,68,69,95,83,85,70,70,73,88,69,83,
2421-
114,83,0,0,0,114,89,0,0,0,114,95,0,0,0,114,
2422-
99,0,0,0,114,101,0,0,0,114,120,0,0,0,114,127,
2423-
0,0,0,114,139,0,0,0,114,145,0,0,0,114,148,0,
2424-
0,0,114,153,0,0,0,218,6,111,98,106,101,99,116,114,
2425-
160,0,0,0,114,165,0,0,0,114,166,0,0,0,114,181,
2426-
0,0,0,114,191,0,0,0,114,207,0,0,0,114,215,0,
2427-
0,0,114,220,0,0,0,114,226,0,0,0,114,221,0,0,
2428-
0,114,227,0,0,0,114,246,0,0,0,114,248,0,0,0,
2429-
114,5,1,0,0,114,23,1,0,0,114,159,0,0,0,114,
2430-
32,1,0,0,114,34,1,0,0,114,4,0,0,0,114,4,
2431-
0,0,0,114,4,0,0,0,114,6,0,0,0,218,8,60,
2432-
109,111,100,117,108,101,62,8,0,0,0,115,108,0,0,0,
2433-
4,16,4,1,4,1,2,1,6,3,8,17,8,5,8,5,
2434-
8,6,8,12,8,10,8,9,8,5,8,7,10,22,10,120,
2435-
16,1,12,2,4,1,4,2,6,2,6,2,8,2,16,45,
2436-
8,34,8,19,8,12,8,12,8,28,8,17,10,55,10,12,
2437-
10,10,8,14,6,3,4,1,14,67,14,64,14,29,16,110,
2438-
14,41,18,45,18,16,4,3,18,53,14,60,14,42,14,127,
2439-
0,5,14,127,0,22,10,23,8,11,8,68,
2388+
12,131,1,1,0,100,2,83,0,41,3,122,41,73,110,115,
2389+
116,97,108,108,32,116,104,101,32,112,97,116,104,45,98,97,
2390+
115,101,100,32,105,109,112,111,114,116,32,99,111,109,112,111,
2391+
110,101,110,116,115,46,114,27,1,0,0,78,41,13,114,32,
2392+
1,0,0,114,159,0,0,0,114,8,0,0,0,114,253,0,
2393+
0,0,114,147,0,0,0,114,5,1,0,0,114,18,1,0,
2394+
0,114,3,0,0,0,114,109,0,0,0,218,9,109,101,116,
2395+
97,95,112,97,116,104,114,161,0,0,0,114,166,0,0,0,
2396+
114,248,0,0,0,41,2,114,31,1,0,0,90,17,115,117,
2397+
112,112,111,114,116,101,100,95,108,111,97,100,101,114,115,114,
2398+
4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,8,
2399+
95,105,110,115,116,97,108,108,155,5,0,0,115,12,0,0,
2400+
0,0,2,8,1,6,1,22,1,10,1,12,1,114,34,1,
2401+
0,0,41,1,122,3,119,105,110,41,2,114,1,0,0,0,
2402+
114,2,0,0,0,41,1,114,49,0,0,0,41,1,78,41,
2403+
3,78,78,78,41,3,78,78,78,41,2,114,62,0,0,0,
2404+
114,62,0,0,0,41,1,78,41,1,78,41,58,114,111,0,
2405+
0,0,114,12,0,0,0,90,37,95,67,65,83,69,95,73,
2406+
78,83,69,78,83,73,84,73,86,69,95,80,76,65,84,70,
2407+
79,82,77,83,95,66,89,84,69,83,95,75,69,89,114,11,
2408+
0,0,0,114,13,0,0,0,114,19,0,0,0,114,21,0,
2409+
0,0,114,30,0,0,0,114,40,0,0,0,114,41,0,0,
2410+
0,114,45,0,0,0,114,46,0,0,0,114,48,0,0,0,
2411+
114,58,0,0,0,218,4,116,121,112,101,218,8,95,95,99,
2412+
111,100,101,95,95,114,142,0,0,0,114,17,0,0,0,114,
2413+
132,0,0,0,114,16,0,0,0,114,20,0,0,0,90,17,
2414+
95,82,65,87,95,77,65,71,73,67,95,78,85,77,66,69,
2415+
82,114,77,0,0,0,114,76,0,0,0,114,88,0,0,0,
2416+
114,78,0,0,0,90,23,68,69,66,85,71,95,66,89,84,
2417+
69,67,79,68,69,95,83,85,70,70,73,88,69,83,90,27,
2418+
79,80,84,73,77,73,90,69,68,95,66,89,84,69,67,79,
2419+
68,69,95,83,85,70,70,73,88,69,83,114,83,0,0,0,
2420+
114,89,0,0,0,114,95,0,0,0,114,99,0,0,0,114,
2421+
101,0,0,0,114,120,0,0,0,114,127,0,0,0,114,139,
2422+
0,0,0,114,145,0,0,0,114,148,0,0,0,114,153,0,
2423+
0,0,218,6,111,98,106,101,99,116,114,160,0,0,0,114,
2424+
165,0,0,0,114,166,0,0,0,114,181,0,0,0,114,191,
2425+
0,0,0,114,207,0,0,0,114,215,0,0,0,114,220,0,
2426+
0,0,114,226,0,0,0,114,221,0,0,0,114,227,0,0,
2427+
0,114,246,0,0,0,114,248,0,0,0,114,5,1,0,0,
2428+
114,23,1,0,0,114,159,0,0,0,114,32,1,0,0,114,
2429+
34,1,0,0,114,4,0,0,0,114,4,0,0,0,114,4,
2430+
0,0,0,114,6,0,0,0,218,8,60,109,111,100,117,108,
2431+
101,62,8,0,0,0,115,108,0,0,0,4,16,4,1,4,
2432+
1,2,1,6,3,8,17,8,5,8,5,8,6,8,12,8,
2433+
10,8,9,8,5,8,7,10,22,10,120,16,1,12,2,4,
2434+
1,4,2,6,2,6,2,8,2,16,45,8,34,8,19,8,
2435+
12,8,12,8,28,8,17,10,55,10,12,10,10,8,14,6,
2436+
3,4,1,14,67,14,64,14,29,16,110,14,41,18,45,18,
2437+
16,4,3,18,53,14,60,14,42,14,127,0,5,14,127,0,
2438+
22,10,23,8,11,8,68,
24402439
};

0 commit comments

Comments
 (0)