summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-05-13 00:09:46 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-05-13 00:09:46 (GMT)
commitbbb093751c776b3e83d31fec941de563a15c56b6 (patch)
tree8e95f88c72ae13335d98a6ba8136c52cd7e7072c
parentab1fb9f72821f4b1ebb8fccb0682e754e6b4f323 (diff)
downloadcpython-bbb093751c776b3e83d31fec941de563a15c56b6.zip
cpython-bbb093751c776b3e83d31fec941de563a15c56b6.tar.gz
cpython-bbb093751c776b3e83d31fec941de563a15c56b6.tar.bz2
use .format and fix a bug
-rw-r--r--Lib/test/test_py3kwarn.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 8fd5586..be18188 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