mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Trivial cleanups following bpo-31370 (#3649)

Browse source 
* Trivial cleanups following bpo-31370

* Also cleanup the "importlib._bootstrap_external" module
This commit is contained in:
Antoine Pitrou 2017-09-18 23:50:44 +02:00 • committed by GitHub
parent b43c4caf81
commit 88c60c9668
16 changed files with 171 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

185
Python/importlib.h
View file

@ -1707,8 +1707,8 @@ const unsigned char _Py_M__importlib[] = {
0,0,0,114,11,0,0,0,218,18,95,98,117,105,108,116,
105,110,95,102,114,111,109,95,110,97,109,101,66,4,0,0,
115,8,0,0,0,0,1,10,1,8,1,12,1,114,197,0,
0,0,99,2,0,0,0,0,0,0,0,12,0,0,0,12,
0,0,0,67,0,0,0,115,244,0,0,0,124,1,97,0,
0,0,99,2,0,0,0,0,0,0,0,10,0,0,0,5,
0,0,0,67,0,0,0,115,174,0,0,0,124,1,97,0,
124,0,97,1,116,2,116,1,131,1,125,2,120,86,116,1,
106,3,160,4,161,0,68,0,93,72,92,2,125,3,125,4,
116,5,124,4,124,2,131,2,114,28,124,3,116,1,106,6,
@ -1719,101 +1719,94 @@ const unsigned char _Py_M__importlib[] = {
100,5,68,0,93,46,125,8,124,8,116,1,106,3,107,7,
114,144,116,13,124,8,131,1,125,9,110,10,116,1,106,3,
124,8,25,0,125,9,116,14,124,7,124,8,124,9,131,3,
1,0,113,120,87,0,121,12,116,13,100,2,131,1,125,10,
87,0,110,24,4,0,116,15,107,10,114,206,1,0,1,0,
1,0,100,3,125,10,89,0,110,2,88,0,116,14,124,7,
100,2,124,10,131,3,1,0,116,13,100,4,131,1,125,11,
116,14,124,7,100,4,124,11,131,3,1,0,100,3,83,0,
41,6,122,250,83,101,116,117,112,32,105,109,112,111,114,116,
108,105,98,32,98,121,32,105,109,112,111,114,116,105,110,103,
32,110,101,101,100,101,100,32,98,117,105,108,116,45,105,110,
32,109,111,100,117,108,101,115,32,97,110,100,32,105,110,106,
101,99,116,105,110,103,32,116,104,101,109,10,32,32,32,32,
105,110,116,111,32,116,104,101,32,103,108,111,98,97,108,32,
110,97,109,101,115,112,97,99,101,46,10,10,32,32,32,32,
65,115,32,115,121,115,32,105,115,32,110,101,101,100,101,100,
32,102,111,114,32,115,121,115,46,109,111,100,117,108,101,115,
32,97,99,99,101,115,115,32,97,110,100,32,95,105,109,112,
32,105,115,32,110,101,101,100,101,100,32,116,111,32,108,111,
97,100,32,98,117,105,108,116,45,105,110,10,32,32,32,32,
109,111,100,117,108,101,115,44,32,116,104,111,115,101,32,116,
119,111,32,109,111,100,117,108,101,115,32,109,117,115,116,32,
98,101,32,101,120,112,108,105,99,105,116,108,121,32,112,97,
115,115,101,100,32,105,110,46,10,10,32,32,32,32,114,167,
0,0,0,114,20,0,0,0,78,114,56,0,0,0,41,1,
114,167,0,0,0,41,16,114,49,0,0,0,114,14,0,0,
0,114,13,0,0,0,114,80,0,0,0,218,5,105,116,101,
109,115,114,171,0,0,0,114,70,0,0,0,114,142,0,0,
0,114,76,0,0,0,114,152,0,0,0,114,129,0,0,0,
114,134,0,0,0,114,1,0,0,0,114,197,0,0,0,114,
5,0,0,0,114,71,0,0,0,41,12,218,10,115,121,115,
95,109,111,100,117,108,101,218,11,95,105,109,112,95,109,111,
100,117,108,101,90,11,109,111,100,117,108,101,95,116,121,112,
101,114,15,0,0,0,114,84,0,0,0,114,94,0,0,0,
114,83,0,0,0,90,11,115,101,108,102,95,109,111,100,117,
108,101,90,12,98,117,105,108,116,105,110,95,110,97,109,101,
90,14,98,117,105,108,116,105,110,95,109,111,100,117,108,101,
90,13,116,104,114,101,97,100,95,109,111,100,117,108,101,90,
14,119,101,97,107,114,101,102,95,109,111,100,117,108,101,114,
1,0,113,120,87,0,100,4,83,0,41,6,122,250,83,101,
116,117,112,32,105,109,112,111,114,116,108,105,98,32,98,121,
32,105,109,112,111,114,116,105,110,103,32,110,101,101,100,101,
100,32,98,117,105,108,116,45,105,110,32,109,111,100,117,108,
101,115,32,97,110,100,32,105,110,106,101,99,116,105,110,103,
32,116,104,101,109,10,32,32,32,32,105,110,116,111,32,116,
104,101,32,103,108,111,98,97,108,32,110,97,109,101,115,112,
97,99,101,46,10,10,32,32,32,32,65,115,32,115,121,115,
32,105,115,32,110,101,101,100,101,100,32,102,111,114,32,115,
121,115,46,109,111,100,117,108,101,115,32,97,99,99,101,115,
115,32,97,110,100,32,95,105,109,112,32,105,115,32,110,101,
101,100,101,100,32,116,111,32,108,111,97,100,32,98,117,105,
108,116,45,105,110,10,32,32,32,32,109,111,100,117,108,101,
115,44,32,116,104,111,115,101,32,116,119,111,32,109,111,100,
117,108,101,115,32,109,117,115,116,32,98,101,32,101,120,112,
108,105,99,105,116,108,121,32,112,97,115,115,101,100,32,105,
110,46,10,10,32,32,32,32,114,20,0,0,0,114,167,0,
0,0,114,56,0,0,0,78,41,3,114,20,0,0,0,114,
167,0,0,0,114,56,0,0,0,41,15,114,49,0,0,0,
114,14,0,0,0,114,13,0,0,0,114,80,0,0,0,218,
5,105,116,101,109,115,114,171,0,0,0,114,70,0,0,0,
114,142,0,0,0,114,76,0,0,0,114,152,0,0,0,114,
129,0,0,0,114,134,0,0,0,114,1,0,0,0,114,197,
0,0,0,114,5,0,0,0,41,10,218,10,115,121,115,95,
109,111,100,117,108,101,218,11,95,105,109,112,95,109,111,100,
117,108,101,90,11,109,111,100,117,108,101,95,116,121,112,101,
114,15,0,0,0,114,84,0,0,0,114,94,0,0,0,114,
83,0,0,0,90,11,115,101,108,102,95,109,111,100,117,108,
101,90,12,98,117,105,108,116,105,110,95,110,97,109,101,90,
14,98,117,105,108,116,105,110,95,109,111,100,117,108,101,114,
10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,6,
95,115,101,116,117,112,73,4,0,0,115,50,0,0,0,0,
95,115,101,116,117,112,73,4,0,0,115,36,0,0,0,0,
9,4,1,4,3,8,1,20,1,10,1,10,1,6,1,10,
1,6,2,2,1,10,1,14,3,10,1,10,1,10,1,10,
2,10,1,16,3,2,1,12,1,14,2,10,1,12,3,8,
1,114,201,0,0,0,99,2,0,0,0,0,0,0,0,2,
0,0,0,3,0,0,0,67,0,0,0,115,38,0,0,0,
116,0,124,0,124,1,131,2,1,0,116,1,106,2,160,3,
116,4,161,1,1,0,116,1,106,2,160,3,116,5,161,1,
1,0,100,1,83,0,41,2,122,48,73,110,115,116,97,108,
108,32,105,109,112,111,114,116,101,114,115,32,102,111,114,32,
98,117,105,108,116,105,110,32,97,110,100,32,102,114,111,122,
101,110,32,109,111,100,117,108,101,115,78,41,6,114,201,0,
0,0,114,14,0,0,0,114,166,0,0,0,114,110,0,0,
0,114,142,0,0,0,114,152,0,0,0,41,2,114,199,0,
0,0,114,200,0,0,0,114,10,0,0,0,114,10,0,0,
0,114,11,0,0,0,218,8,95,105,110,115,116,97,108,108,
120,4,0,0,115,6,0,0,0,0,2,10,2,12,1,114,
202,0,0,0,99,0,0,0,0,0,0,0,0,1,0,0,
0,4,0,0,0,67,0,0,0,115,32,0,0,0,100,1,
100,2,108,0,125,0,124,0,97,1,124,0,160,2,116,3,
106,4,116,5,25,0,161,1,1,0,100,2,83,0,41,3,
122,57,73,110,115,116,97,108,108,32,105,109,112,111,114,116,
101,114,115,32,116,104,97,116,32,114,101,113,117,105,114,101,
32,101,120,116,101,114,110,97,108,32,102,105,108,101,115,121,
115,116,101,109,32,97,99,99,101,115,115,114,19,0,0,0,
78,41,6,218,26,95,102,114,111,122,101,110,95,105,109,112,
111,114,116,108,105,98,95,101,120,116,101,114,110,97,108,114,
116,0,0,0,114,202,0,0,0,114,14,0,0,0,114,80,
0,0,0,114,1,0,0,0,41,1,114,203,0,0,0,114,
10,0,0,0,114,10,0,0,0,114,11,0,0,0,218,27,
95,105,110,115,116,97,108,108,95,101,120,116,101,114,110,97,
108,95,105,109,112,111,114,116,101,114,115,128,4,0,0,115,
6,0,0,0,0,3,8,1,4,1,114,204,0,0,0,41,
2,78,78,41,1,78,41,2,78,114,19,0,0,0,41,51,
114,3,0,0,0,114,116,0,0,0,114,12,0,0,0,114,
16,0,0,0,114,51,0,0,0,114,29,0,0,0,114,36,
0,0,0,114,17,0,0,0,114,18,0,0,0,114,41,0,
0,0,114,42,0,0,0,114,45,0,0,0,114,57,0,0,
0,114,59,0,0,0,114,69,0,0,0,114,75,0,0,0,
114,78,0,0,0,114,85,0,0,0,114,96,0,0,0,114,
97,0,0,0,114,103,0,0,0,114,79,0,0,0,114,129,
0,0,0,114,134,0,0,0,114,137,0,0,0,114,92,0,
0,0,114,81,0,0,0,114,140,0,0,0,114,141,0,0,
0,114,82,0,0,0,114,142,0,0,0,114,152,0,0,0,
114,157,0,0,0,114,163,0,0,0,114,165,0,0,0,114,
170,0,0,0,114,174,0,0,0,90,15,95,69,82,82,95,
77,83,71,95,80,82,69,70,73,88,114,176,0,0,0,114,
179,0,0,0,218,6,111,98,106,101,99,116,114,180,0,0,
0,114,181,0,0,0,114,182,0,0,0,114,189,0,0,0,
114,193,0,0,0,114,196,0,0,0,114,197,0,0,0,114,
201,0,0,0,114,202,0,0,0,114,204,0,0,0,114,10,
0,0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,
0,0,218,8,60,109,111,100,117,108,101,62,25,0,0,0,
115,96,0,0,0,4,0,4,2,8,8,8,8,4,2,4,
3,16,4,14,68,14,21,14,16,8,37,8,17,8,11,14,
8,8,11,8,12,8,16,8,36,14,27,14,101,16,26,10,
45,14,60,8,17,8,17,8,24,8,29,8,23,8,15,14,
73,14,77,14,13,8,9,8,9,10,47,8,16,4,1,8,
2,8,27,6,3,8,16,10,15,8,31,8,27,18,35,8,
7,8,47,8,8,
2,10,1,114,201,0,0,0,99,2,0,0,0,0,0,0,
0,2,0,0,0,3,0,0,0,67,0,0,0,115,38,0,
0,0,116,0,124,0,124,1,131,2,1,0,116,1,106,2,
160,3,116,4,161,1,1,0,116,1,106,2,160,3,116,5,
161,1,1,0,100,1,83,0,41,2,122,48,73,110,115,116,
97,108,108,32,105,109,112,111,114,116,101,114,115,32,102,111,
114,32,98,117,105,108,116,105,110,32,97,110,100,32,102,114,
111,122,101,110,32,109,111,100,117,108,101,115,78,41,6,114,
201,0,0,0,114,14,0,0,0,114,166,0,0,0,114,110,
0,0,0,114,142,0,0,0,114,152,0,0,0,41,2,114,
199,0,0,0,114,200,0,0,0,114,10,0,0,0,114,10,
0,0,0,114,11,0,0,0,218,8,95,105,110,115,116,97,
108,108,108,4,0,0,115,6,0,0,0,0,2,10,2,12,
1,114,202,0,0,0,99,0,0,0,0,0,0,0,0,1,
0,0,0,4,0,0,0,67,0,0,0,115,32,0,0,0,
100,1,100,2,108,0,125,0,124,0,97,1,124,0,160,2,
116,3,106,4,116,5,25,0,161,1,1,0,100,2,83,0,
41,3,122,57,73,110,115,116,97,108,108,32,105,109,112,111,
114,116,101,114,115,32,116,104,97,116,32,114,101,113,117,105,
114,101,32,101,120,116,101,114,110,97,108,32,102,105,108,101,
115,121,115,116,101,109,32,97,99,99,101,115,115,114,19,0,
0,0,78,41,6,218,26,95,102,114,111,122,101,110,95,105,
109,112,111,114,116,108,105,98,95,101,120,116,101,114,110,97,
108,114,116,0,0,0,114,202,0,0,0,114,14,0,0,0,
114,80,0,0,0,114,1,0,0,0,41,1,114,203,0,0,
0,114,10,0,0,0,114,10,0,0,0,114,11,0,0,0,
218,27,95,105,110,115,116,97,108,108,95,101,120,116,101,114,
110,97,108,95,105,109,112,111,114,116,101,114,115,116,4,0,
0,115,6,0,0,0,0,3,8,1,4,1,114,204,0,0,
0,41,2,78,78,41,1,78,41,2,78,114,19,0,0,0,
41,51,114,3,0,0,0,114,116,0,0,0,114,12,0,0,
0,114,16,0,0,0,114,51,0,0,0,114,29,0,0,0,
114,36,0,0,0,114,17,0,0,0,114,18,0,0,0,114,
41,0,0,0,114,42,0,0,0,114,45,0,0,0,114,57,
0,0,0,114,59,0,0,0,114,69,0,0,0,114,75,0,
0,0,114,78,0,0,0,114,85,0,0,0,114,96,0,0,
0,114,97,0,0,0,114,103,0,0,0,114,79,0,0,0,
114,129,0,0,0,114,134,0,0,0,114,137,0,0,0,114,
92,0,0,0,114,81,0,0,0,114,140,0,0,0,114,141,
0,0,0,114,82,0,0,0,114,142,0,0,0,114,152,0,
0,0,114,157,0,0,0,114,163,0,0,0,114,165,0,0,
0,114,170,0,0,0,114,174,0,0,0,90,15,95,69,82,
82,95,77,83,71,95,80,82,69,70,73,88,114,176,0,0,
0,114,179,0,0,0,218,6,111,98,106,101,99,116,114,180,
0,0,0,114,181,0,0,0,114,182,0,0,0,114,189,0,
0,0,114,193,0,0,0,114,196,0,0,0,114,197,0,0,
0,114,201,0,0,0,114,202,0,0,0,114,204,0,0,0,
114,10,0,0,0,114,10,0,0,0,114,10,0,0,0,114,
11,0,0,0,218,8,60,109,111,100,117,108,101,62,25,0,
0,0,115,96,0,0,0,4,0,4,2,8,8,8,8,4,
2,4,3,16,4,14,68,14,21,14,16,8,37,8,17,8,
11,14,8,8,11,8,12,8,16,8,36,14,27,14,101,16,
26,10,45,14,60,8,17,8,17,8,24,8,29,8,23,8,
15,14,73,14,77,14,13,8,9,8,9,10,47,8,16,4,
1,8,2,8,27,6,3,8,16,10,15,8,31,8,27,18,
35,8,7,8,35,8,8,
};