Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-09 01:51:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #25280: Import trace messages emitted in verbose (-v) mode are no

Browse source 
longer formatted twice.
This commit is contained in:
Serhiy Storchaka 2015-10-01 11:40:22 +03:00
commit 0b40aab6f0
3 changed files with 64 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/importlib/_bootstrap_external.py
View file

@ -437,15 +437,15 @@ def _validate_bytecode_header(data, source_stats=None, name=None, path=None):
raw_size = data[8:12]
if magic != MAGIC_NUMBER:
message = 'bad magic number in {!r}: {!r}'.format(name, magic)
_verbose_message(message)
_verbose_message('{}', message)
raise ImportError(message, **exc_details)
elif len(raw_timestamp) != 4:
message = 'reached EOF while reading timestamp in {!r}'.format(name)
_verbose_message(message)
_verbose_message('{}', message)
raise EOFError(message)
elif len(raw_size) != 4:
message = 'reached EOF while reading size of source in {!r}'.format(name)
_verbose_message(message)
_verbose_message('{}', message)
raise EOFError(message)
if source_stats is not None:
try:
@ -455,7 +455,7 @@ def _validate_bytecode_header(data, source_stats=None, name=None, path=None):
else:
if _r_long(raw_timestamp) != source_mtime:
message = 'bytecode is stale for {!r}'.format(name)
_verbose_message(message)
_verbose_message('{}', message)
raise ImportError(message, **exc_details)
try:
source_size = source_stats['size'] & 0xFFFFFFFF