traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

longer formatted twice.
This commit is contained in:
Serhiy Storchaka 2015-10-01 11:55:52 +03:00
parent 0e25a8f225 0b40aab6f0
commit f22d8080ae
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/importlib/_bootstrap_external.py
View File

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

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ Release date: XXXX-XX-XX
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #25280: Import trace messages emitted in verbose (-v) mode are no
longer formatted twice.
- Issue #25227: Optimize ASCII and latin1 encoders with the ``surrogateescape`` - Issue #25227: Optimize ASCII and latin1 encoders with the ``surrogateescape``
error handler: the encoders are now up to 3 times as fast. Initial patch error handler: the encoders are now up to 3 times as fast. Initial patch
written by Serhiy Storchaka. written by Serhiy Storchaka.