[Python-checkins] cpython (merge 3.2 -> default): #12074: merge with 3.2.

ezio.melotti python-checkins at python.org
Tue May 24 00:04:16 CEST 2011


http://hg.python.org/cpython/rev/9de2b1a5ee6b
changeset:   70320:9de2b1a5ee6b
parent:      70317:be1d408018bf
parent:      70319:396f4ed61db7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue May 24 01:01:08 2011 +0300
summary:
  #12074: merge with 3.2.

files:
  Lib/test/regrtest.py |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -632,7 +632,8 @@
                     continue
                 accumulate_result(test, result)
                 if not quiet:
-                    print("[{1:{0}}{2}/{3}] {4}".format(
+                    fmt = "[{1:{0}}{2}/{3}] {4}" if bad else "[{1:{0}}{2}] {4}"
+                    print(fmt.format(
                         test_count_width, test_index, test_count,
                         len(bad), test))
                 if stdout:
@@ -653,7 +654,8 @@
     else:
         for test_index, test in enumerate(tests, 1):
             if not quiet:
-                print("[{1:{0}}{2}/{3}] {4}".format(
+                fmt = "[{1:{0}}{2}/{3}] {4}" if bad else "[{1:{0}}{2}] {4}"
+                print(fmt.format(
                     test_count_width, test_index, test_count, len(bad), test))
                 sys.stdout.flush()
             if trace:

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list