[Python-checkins] cpython (merge default -> default): Merge heads.

Tue May 24 00:04:17 CEST 2011

http://hg.python.org/cpython/rev/202d973e8bf5
changeset: 70321:202d973e8bf5
parent: 70318:1b1471d50b9e
parent: 70320:9de2b1a5ee6b
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue May 24 01:03:33 2011 +0300
summary:
 Merge heads.
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
