Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0b40aab

Browse files
serhiy-storchakaserhiy-storchaka
committed
Issue #25280: Import trace messages emitted in verbose (-v) mode are no
longer formatted twice.
2 parents 861f067 + f731bc0 commit 0b40aab

3 files changed

Lines changed: 64 additions & 60 deletions

File tree

‎Lib/importlib/_bootstrap_external.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,15 +437,15 @@ def _validate_bytecode_header(data, source_stats=None, name=None, path=None):
437437
raw_size = data[8:12]
438438
if magic != MAGIC_NUMBER:
439439
message = 'bad magic number in {!r}: {!r}'.format(name, magic)
440-
_verbose_message(message)
440+
_verbose_message('{}', message)
441441
raise ImportError(message, **exc_details)
442442
elif len(raw_timestamp) != 4:
443443
message = 'reached EOF while reading timestamp in {!r}'.format(name)
444-
_verbose_message(message)
444+
_verbose_message('{}', message)
445445
raise EOFError(message)
446446
elif len(raw_size) != 4:
447447
message = 'reached EOF while reading size of source in {!r}'.format(name)
448-
_verbose_message(message)
448+
_verbose_message('{}', message)
449449
raise EOFError(message)
450450
if source_stats is not None:
451451
try:
@@ -455,7 +455,7 @@ def _validate_bytecode_header(data, source_stats=None, name=None, path=None):
455455
else:
456456
if _r_long(raw_timestamp) != source_mtime:
457457
message = 'bytecode is stale for {!r}'.format(name)
458-
_verbose_message(message)
458+
_verbose_message('{}', message)
459459
raise ImportError(message, **exc_details)
460460
try:
461461
source_size = source_stats['size'] & 0xFFFFFFFF

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ Release date: TBA
1111
Core and Builtins
1212
-----------------
1313

14+
- Issue #25280: Import trace messages emitted in verbose (-v) mode are no
15+
longer formatted twice.
16+
1417
- Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the
1518
getrandom() function instead of the getentropy() function. The getentropy()
1619
function is blocking to generate very good quality entropy, os.urandom()

‎Python/importlib_external.h‎

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -635,66 +635,67 @@ const unsigned char _Py_M__importlib_external[] = {
635635
95,102,105,110,100,95,109,111,100,117,108,101,95,115,104,105,
636636
109,143,1,0,0,115,10,0,0,0,0,10,21,1,24,1,
637637
6,1,29,1,114,130,0,0,0,99,4,0,0,0,0,0,
638-
0,0,11,0,0,0,19,0,0,0,67,0,0,0,115,228,
638+
0,0,11,0,0,0,19,0,0,0,67,0,0,0,115,240,
639639
1,0,0,105,0,0,125,4,0,124,2,0,100,1,0,107,
640640
9,0,114,31,0,124,2,0,124,4,0,100,2,0,60,110,
641641
6,0,100,3,0,125,2,0,124,3,0,100,1,0,107,9,
642642
0,114,59,0,124,3,0,124,4,0,100,4,0,60,124,0,
643643
0,100,1,0,100,5,0,133,2,0,25,125,5,0,124,0,
644644
0,100,5,0,100,6,0,133,2,0,25,125,6,0,124,0,
645645
0,100,6,0,100,7,0,133,2,0,25,125,7,0,124,5,
646-
0,116,0,0,107,3,0,114,165,0,100,8,0,106,1,0,
647-
124,2,0,124,5,0,131,2,0,125,8,0,116,2,0,124,
648-
8,0,131,1,0,1,116,3,0,124,8,0,124,4,0,141,
649-
1,0,130,1,0,110,113,0,116,4,0,124,6,0,131,1,
650-
0,100,5,0,107,3,0,114,223,0,100,9,0,106,1,0,
651-
124,2,0,131,1,0,125,8,0,116,2,0,124,8,0,131,
652-
1,0,1,116,5,0,124,8,0,131,1,0,130,1,0,110,
653-
55,0,116,4,0,124,7,0,131,1,0,100,5,0,107,3,
654-
0,114,22,1,100,10,0,106,1,0,124,2,0,131,1,0,
655-
125,8,0,116,2,0,124,8,0,131,1,0,1,116,5,0,
656-
124,8,0,131,1,0,130,1,0,124,1,0,100,1,0,107,
657-
9,0,114,214,1,121,20,0,116,6,0,124,1,0,100,11,
658-
0,25,131,1,0,125,9,0,87,110,18,0,4,116,7,0,
659-
107,10,0,114,74,1,1,1,1,89,110,59,0,88,116,8,
660-
0,124,6,0,131,1,0,124,9,0,107,3,0,114,133,1,
661-
100,12,0,106,1,0,124,2,0,131,1,0,125,8,0,116,
662-
2,0,124,8,0,131,1,0,1,116,3,0,124,8,0,124,
663-
4,0,141,1,0,130,1,0,121,18,0,124,1,0,100,13,
664-
0,25,100,14,0,64,125,10,0,87,110,18,0,4,116,7,
665-
0,107,10,0,114,171,1,1,1,1,89,110,43,0,88,116,
666-
8,0,124,7,0,131,1,0,124,10,0,107,3,0,114,214,
667-
1,116,3,0,100,12,0,106,1,0,124,2,0,131,1,0,
668-
124,4,0,141,1,0,130,1,0,124,0,0,100,7,0,100,
669-
1,0,133,2,0,25,83,41,15,97,122,1,0,0,86,97,
670-
108,105,100,97,116,101,32,116,104,101,32,104,101,97,100,101,
671-
114,32,111,102,32,116,104,101,32,112,97,115,115,101,100,45,
672-
105,110,32,98,121,116,101,99,111,100,101,32,97,103,97,105,
673-
110,115,116,32,115,111,117,114,99,101,95,115,116,97,116,115,
674-
32,40,105,102,10,32,32,32,32,103,105,118,101,110,41,32,
675-
97,110,100,32,114,101,116,117,114,110,105,110,103,32,116,104,
676-
101,32,98,121,116,101,99,111,100,101,32,116,104,97,116,32,
677-
99,97,110,32,98,101,32,99,111,109,112,105,108,101,100,32,
678-
98,121,32,99,111,109,112,105,108,101,40,41,46,10,10,32,
679-
32,32,32,65,108,108,32,111,116,104,101,114,32,97,114,103,
680-
117,109,101,110,116,115,32,97,114,101,32,117,115,101,100,32,
681-
116,111,32,101,110,104,97,110,99,101,32,101,114,114,111,114,
682-
32,114,101,112,111,114,116,105,110,103,46,10,10,32,32,32,
683-
32,73,109,112,111,114,116,69,114,114,111,114,32,105,115,32,
684-
114,97,105,115,101,100,32,119,104,101,110,32,116,104,101,32,
685-
109,97,103,105,99,32,110,117,109,98,101,114,32,105,115,32,
686-
105,110,99,111,114,114,101,99,116,32,111,114,32,116,104,101,
687-
32,98,121,116,101,99,111,100,101,32,105,115,10,32,32,32,
688-
32,102,111,117,110,100,32,116,111,32,98,101,32,115,116,97,
689-
108,101,46,32,69,79,70,69,114,114,111,114,32,105,115,32,
690-
114,97,105,115,101,100,32,119,104,101,110,32,116,104,101,32,
691-
100,97,116,97,32,105,115,32,102,111,117,110,100,32,116,111,
692-
32,98,101,10,32,32,32,32,116,114,117,110,99,97,116,101,
693-
100,46,10,10,32,32,32,32,78,114,106,0,0,0,122,10,
694-
60,98,121,116,101,99,111,100,101,62,114,35,0,0,0,114,
695-
12,0,0,0,233,8,0,0,0,233,12,0,0,0,122,30,
696-
98,97,100,32,109,97,103,105,99,32,110,117,109,98,101,114,
697-
32,105,110,32,123,33,114,125,58,32,123,33,114,125,122,43,
646+
0,116,0,0,107,3,0,114,168,0,100,8,0,106,1,0,
647+
124,2,0,124,5,0,131,2,0,125,8,0,116,2,0,100,
648+
9,0,124,8,0,131,2,0,1,116,3,0,124,8,0,124,
649+
4,0,141,1,0,130,1,0,110,119,0,116,4,0,124,6,
650+
0,131,1,0,100,5,0,107,3,0,114,229,0,100,10,0,
651+
106,1,0,124,2,0,131,1,0,125,8,0,116,2,0,100,
652+
9,0,124,8,0,131,2,0,1,116,5,0,124,8,0,131,
653+
1,0,130,1,0,110,58,0,116,4,0,124,7,0,131,1,
654+
0,100,5,0,107,3,0,114,31,1,100,11,0,106,1,0,
655+
124,2,0,131,1,0,125,8,0,116,2,0,100,9,0,124,
656+
8,0,131,2,0,1,116,5,0,124,8,0,131,1,0,130,
657+
1,0,124,1,0,100,1,0,107,9,0,114,226,1,121,20,
658+
0,116,6,0,124,1,0,100,12,0,25,131,1,0,125,9,
659+
0,87,110,18,0,4,116,7,0,107,10,0,114,83,1,1,
660+
1,1,89,110,62,0,88,116,8,0,124,6,0,131,1,0,
661+
124,9,0,107,3,0,114,145,1,100,13,0,106,1,0,124,
662+
2,0,131,1,0,125,8,0,116,2,0,100,9,0,124,8,
663+
0,131,2,0,1,116,3,0,124,8,0,124,4,0,141,1,
664+
0,130,1,0,121,18,0,124,1,0,100,14,0,25,100,15,
665+
0,64,125,10,0,87,110,18,0,4,116,7,0,107,10,0,
666+
114,183,1,1,1,1,89,110,43,0,88,116,8,0,124,7,
667+
0,131,1,0,124,10,0,107,3,0,114,226,1,116,3,0,
668+
100,13,0,106,1,0,124,2,0,131,1,0,124,4,0,141,
669+
1,0,130,1,0,124,0,0,100,7,0,100,1,0,133,2,
670+
0,25,83,41,16,97,122,1,0,0,86,97,108,105,100,97,
671+
116,101,32,116,104,101,32,104,101,97,100,101,114,32,111,102,
672+
32,116,104,101,32,112,97,115,115,101,100,45,105,110,32,98,
673+
121,116,101,99,111,100,101,32,97,103,97,105,110,115,116,32,
674+
115,111,117,114,99,101,95,115,116,97,116,115,32,40,105,102,
675+
10,32,32,32,32,103,105,118,101,110,41,32,97,110,100,32,
676+
114,101,116,117,114,110,105,110,103,32,116,104,101,32,98,121,
677+
116,101,99,111,100,101,32,116,104,97,116,32,99,97,110,32,
678+
98,101,32,99,111,109,112,105,108,101,100,32,98,121,32,99,
679+
111,109,112,105,108,101,40,41,46,10,10,32,32,32,32,65,
680+
108,108,32,111,116,104,101,114,32,97,114,103,117,109,101,110,
681+
116,115,32,97,114,101,32,117,115,101,100,32,116,111,32,101,
682+
110,104,97,110,99,101,32,101,114,114,111,114,32,114,101,112,
683+
111,114,116,105,110,103,46,10,10,32,32,32,32,73,109,112,
684+
111,114,116,69,114,114,111,114,32,105,115,32,114,97,105,115,
685+
101,100,32,119,104,101,110,32,116,104,101,32,109,97,103,105,
686+
99,32,110,117,109,98,101,114,32,105,115,32,105,110,99,111,
687+
114,114,101,99,116,32,111,114,32,116,104,101,32,98,121,116,
688+
101,99,111,100,101,32,105,115,10,32,32,32,32,102,111,117,
689+
110,100,32,116,111,32,98,101,32,115,116,97,108,101,46,32,
690+
69,79,70,69,114,114,111,114,32,105,115,32,114,97,105,115,
691+
101,100,32,119,104,101,110,32,116,104,101,32,100,97,116,97,
692+
32,105,115,32,102,111,117,110,100,32,116,111,32,98,101,10,
693+
32,32,32,32,116,114,117,110,99,97,116,101,100,46,10,10,
694+
32,32,32,32,78,114,106,0,0,0,122,10,60,98,121,116,
695+
101,99,111,100,101,62,114,35,0,0,0,114,12,0,0,0,
696+
233,8,0,0,0,233,12,0,0,0,122,30,98,97,100,32,
697+
109,97,103,105,99,32,110,117,109,98,101,114,32,105,110,32,
698+
123,33,114,125,58,32,123,33,114,125,122,2,123,125,122,43,
698699
114,101,97,99,104,101,100,32,69,79,70,32,119,104,105,108,
699700
101,32,114,101,97,100,105,110,103,32,116,105,109,101,115,116,
700701
97,109,112,32,105,110,32,123,33,114,125,122,48,114,101,97,
@@ -719,9 +720,9 @@ const unsigned char _Py_M__importlib_external[] = {
719720
95,118,97,108,105,100,97,116,101,95,98,121,116,101,99,111,
720721
100,101,95,104,101,97,100,101,114,160,1,0,0,115,76,0,
721722
0,0,0,11,6,1,12,1,13,3,6,1,12,1,10,1,
722-
16,1,16,1,16,1,12,1,18,1,10,1,18,1,18,1,
723-
15,1,10,1,15,1,18,1,15,1,10,1,12,1,12,1,
724-
3,1,20,1,13,1,5,2,18,1,15,1,10,1,15,1,
723+
16,1,16,1,16,1,12,1,18,1,13,1,18,1,18,1,
724+
15,1,13,1,15,1,18,1,15,1,13,1,12,1,12,1,
725+
3,1,20,1,13,1,5,2,18,1,15,1,13,1,15,1,
725726
3,1,18,1,13,1,5,2,18,1,15,1,9,1,114,141,
726727
0,0,0,99,4,0,0,0,0,0,0,0,5,0,0,0,
727728
6,0,0,0,67,0,0,0,115,112,0,0,0,116,0,0,

0 commit comments

Comments
 (0)