From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 1 Oct 2015 08:55:52 +0000 (+0300)
Subject: Issue #25280: Import trace messages emitted in verbose (-v) mode are no
X-Git-Tag: v3.6.0a1~1358
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f22d8080ae9f4106d04721fa17660c5b7faf05f2;p=thirdparty%2FPython%2Fcpython.git

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

f22d8080ae9f4106d04721fa17660c5b7faf05f2
diff --cc Lib/importlib/_bootstrap_external.py
index abde6d9afec5,616b17f89a82..e0a1200547bd
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@@ -429,15 -437,15 +429,15 @@@ def _validate_bytecode_header(data, sou
      raw_size = data[8:12]
      if magic != MAGIC_NUMBER:
          message = 'bad magic number in {!r}: {!r}'.format(name, magic)
-         _bootstrap._verbose_message(message)
 -        _verbose_message('{}', message)
++        _bootstrap._verbose_message('{}', message)
          raise ImportError(message, **exc_details)
      elif len(raw_timestamp) != 4:
          message = 'reached EOF while reading timestamp in {!r}'.format(name)
-         _bootstrap._verbose_message(message)
 -        _verbose_message('{}', message)
++        _bootstrap._verbose_message('{}', message)
          raise EOFError(message)
      elif len(raw_size) != 4:
          message = 'reached EOF while reading size of source in {!r}'.format(name)
-         _bootstrap._verbose_message(message)
 -        _verbose_message('{}', message)
++        _bootstrap._verbose_message('{}', message)
          raise EOFError(message)
      if source_stats is not None:
          try:
@@@ -447,7 -455,7 +447,7 @@@
          else:
              if _r_long(raw_timestamp) != source_mtime:
                  message = 'bytecode is stale for {!r}'.format(name)
-                 _bootstrap._verbose_message(message)
 -                _verbose_message('{}', message)
++                _bootstrap._verbose_message('{}', message)
                  raise ImportError(message, **exc_details)
          try:
              source_size = source_stats['size'] & 0xFFFFFFFF
diff --cc Misc/NEWS
index a1aa269c70ac,354e9ec1d14b..68c0be198cb8
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -11,9 +10,13 @@@ Release date: XXXX-XX-X
  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``
 +  error handler: the encoders are now up to 3 times as fast. Initial patch
 +  written by Serhiy Storchaka.
 +
  - Issue #25003: On Solaris 11.3 or newer, os.urandom() now uses the
    getrandom() function instead of the getentropy() function. The getentropy()
    function is blocking to generate very good quality entropy, os.urandom()