[Python-checkins] cpython (merge 3.3 -> default): #17217: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/562ba95dd4c9
changeset:   82335:562ba95dd4c9
parent:      82332:cb46ccdc226a
parent:      82334:3eb693462891
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Feb 23 07:58:28 2013 +0200
summary:
  #17217: merge with 3.3.

files:
  Lib/test/test_format.py |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
--- a/Lib/test/test_format.py
+++ b/Lib/test/test_format.py
@@ -14,10 +14,10 @@
 def testformat(formatstr, args, output=None, limit=None, overflowok=False):
     if verbose:
         if output:
-            print("%r %% %r =? %r ..." %\
-                (formatstr, args, output), end=' ')
+            print("{!a} % {!a} =? {!a} ...".format(formatstr, args, output),
+                  end=' ')
         else:
-            print("%r %% %r works? ..." % (formatstr, args), end=' ')
+            print("{!a} % {!a} works? ...".format(formatstr, args), end=' ')
     try:
         result = formatstr % args
     except OverflowError:

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