From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 May 2008 00:09:46 +0000 (+0000)
Subject: use .format and fix a bug
X-Git-Tag: v2.6b1~445
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbb093751c776b3e83d31fec941de563a15c56b6;p=thirdparty%2FPython%2Fcpython.git

use .format and fix a bug
---

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 8fd5586e17cf..be18188a7221 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -133,7 +133,7 @@ class TestStdlibRemovals(unittest.TestCase):
                         'ihooks', 'mhlib')
     inclusive_platforms = {'irix' : ('pure',),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
-                                      'icglue', 'Nav', 'MacOS', 'aepack', 'aetools'
+                                      'icglue', 'Nav', 'MacOS', 'aepack', 'aetools',
                                       'aetypes', 'applesingle', 'appletrawmain',
                                       'appletrunner', 'argvemulator', 'bgenlocations',
                                       'EasyDialogs', 'macerrors', 'macostools',
@@ -162,11 +162,11 @@ class TestStdlibRemovals(unittest.TestCase):
                                  % module_name)
                 except ImportError:
                     if not optional:
-                        self.fail("Non-optional module %s raised an "
-                                  "ImportError." % module_name)
+                        self.fail("Non-optional module {0} raised an "
+                                  "ImportError.".format(module_name))
                 else:
-                    self.fail("DeprecationWarning not raised for %s" %
-                                module_name)
+                    self.fail("DeprecationWarning not raised for {0}"
+                                .format(module_name))
 
     def test_platform_independent_removals(self):
         # Make sure that the modules that are available on all platforms raise