[Python-checkins] cpython: Issue #18780: code cleanup.

[ethan.furman]

http://hg.python.org/cpython/rev/833246d42825
changeset:   85475:833246d42825
user:        Ethan Furman <ethan at stoneleaf.us>
date:        Sat Aug 31 12:48:51 2013 -0700
summary:
  Issue #18780: code cleanup.

files:
  Lib/test/test_unicode.py |  53 ++++++++++-----------------
  1 files changed, 19 insertions(+), 34 deletions(-)


diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1134,42 +1134,27 @@
         class Str(str, enum.Enum):
             ABC = 'abc'
         # Testing Unicode formatting strings...
-        self.assertEqual(
-                "%s, %s" % (Str.ABC, Str.ABC),
-                'Str.ABC, Str.ABC',
-                )
-        self.assertEqual(
-                "%s, %s, %d, %i, %u, %f, %5.2f" %
-                    (Str.ABC, Str.ABC,
-                     Int.IDES, Int.IDES, Int.IDES,
-                     Float.PI, Float.PI),
-                'Str.ABC, Str.ABC, 15, 15, 15, 3.141593,  3.14')
+        self.assertEqual("%s, %s" % (Str.ABC, Str.ABC),
+                         'Str.ABC, Str.ABC')
+        self.assertEqual("%s, %s, %d, %i, %u, %f, %5.2f" %
+                        (Str.ABC, Str.ABC,
+                         Int.IDES, Int.IDES, Int.IDES,
+                         Float.PI, Float.PI),
+                         'Str.ABC, Str.ABC, 15, 15, 15, 3.141593,  3.14')
 
         # formatting jobs delegated from the string implementation:
-        self.assertEqual(
-                '...%(foo)s...' % {'foo':Str.ABC},
-                '...Str.ABC...',
-                )
-        self.assertEqual(
-                '...%(foo)s...' % {'foo':Int.IDES},
-                '...Int.IDES...',
-                )
-        self.assertEqual(
-                '...%(foo)i...' % {'foo':Int.IDES},
-                '...15...',
-                )
-        self.assertEqual(
-                '...%(foo)d...' % {'foo':Int.IDES},
-                '...15...',
-                )
-        self.assertEqual(
-                '...%(foo)u...' % {'foo':Int.IDES, 'def':Float.PI},
-                '...15...',
-                )
-        self.assertEqual(
-                '...%(foo)f...' % {'foo':Float.PI,'def':123},
-                '...3.141593...',
-                )
+        self.assertEqual('...%(foo)s...' % {'foo':Str.ABC},
+                         '...Str.ABC...')
+        self.assertEqual('...%(foo)s...' % {'foo':Int.IDES},
+                         '...Int.IDES...')
+        self.assertEqual('...%(foo)i...' % {'foo':Int.IDES},
+                         '...15...')
+        self.assertEqual('...%(foo)d...' % {'foo':Int.IDES},
+                         '...15...')
+        self.assertEqual('...%(foo)u...' % {'foo':Int.IDES, 'def':Float.PI},
+                         '...15...')
+        self.assertEqual('...%(foo)f...' % {'foo':Float.PI,'def':123},
+                         '...3.141593...')
 
     @support.cpython_only
     def test_formatting_huge_precision(self):

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