mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 11:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Make test_format.py pass again (error messages have changed).

Browse source 
Remove duplicate tests.

Test str and str8 in test_both().
This commit is contained in:
Walter Dörwald 2007-05-21 21:02:54 +00:00
parent 3353a2ec47
commit 88effc1251
1 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Lib/test/test_format.py
View file

@ -35,9 +35,8 @@ def testformat(formatstr, args, output=None):
print('yes') print('yes')
def testboth(formatstr, *args): def testboth(formatstr, *args):
testformat(str8(formatstr), *args)
testformat(formatstr, *args) testformat(formatstr, *args)
if have_unicode:
testformat(str(formatstr), *args)
testboth("%.1d", (1,), "1") testboth("%.1d", (1,), "1")
@ -165,32 +164,18 @@ testboth("%0#34.33o", big, "0012345670123456701234567012345670")
# Some small ints, in both Python int and long flavors). # Some small ints, in both Python int and long flavors).
testboth("%d", 42, "42") testboth("%d", 42, "42")
testboth("%d", -42, "-42") testboth("%d", -42, "-42")
testboth("%d", 42, "42")
testboth("%d", -42, "-42")
testboth("%#x", 1, "0x1")
testboth("%#x", 1, "0x1") testboth("%#x", 1, "0x1")
testboth("%#X", 1, "0X1") testboth("%#X", 1, "0X1")
testboth("%#X", 1, "0X1")
testboth("%#o", 1, "01")
testboth("%#o", 1, "01") testboth("%#o", 1, "01")
testboth("%#o", 0, "0") testboth("%#o", 0, "0")
testboth("%#o", 0, "0")
testboth("%o", 0, "0")
testboth("%o", 0, "0") testboth("%o", 0, "0")
testboth("%d", 0, "0") testboth("%d", 0, "0")
testboth("%d", 0, "0")
testboth("%#x", 0, "0x0") testboth("%#x", 0, "0x0")
testboth("%#x", 0, "0x0")
testboth("%#X", 0, "0X0")
testboth("%#X", 0, "0X0") testboth("%#X", 0, "0X0")
testboth("%x", 0x42, "42")
testboth("%x", -0x42, "-42")
testboth("%x", 0x42, "42") testboth("%x", 0x42, "42")
testboth("%x", -0x42, "-42") testboth("%x", -0x42, "-42")
testboth("%o", 042, "42")
testboth("%o", -042, "-42")
testboth("%o", 042, "42") testboth("%o", 042, "42")
testboth("%o", -042, "-42") testboth("%o", -042, "-42")
@ -217,12 +202,11 @@ def test_exc(formatstr, args, exception, excmsg):
test_exc('abc %a', 1, ValueError, test_exc('abc %a', 1, ValueError,
"unsupported format character 'a' (0x61) at index 5") "unsupported format character 'a' (0x61) at index 5")
if have_unicode: test_exc(str(b'abc %\u3000', 'raw-unicode-escape'), 1, ValueError,
test_exc(str('abc %\u3000','raw-unicode-escape'), 1, ValueError, "unsupported format character '?' (0x3000) at index 5")
"unsupported format character '?' (0x3000) at index 5")
test_exc('%d', '1', TypeError, "int argument required, not str") test_exc('%d', '1', TypeError, "an integer is required")
test_exc('%g', '1', TypeError, "float argument required, not str") test_exc('%g', '1', TypeError, "a float is required")
test_exc('no format', '1', TypeError, test_exc('no format', '1', TypeError,
"not all arguments converted during string formatting") "not all arguments converted during string formatting")
test_exc('no format', '1', TypeError, test_exc('no format', '1', TypeError,
@ -238,7 +222,7 @@ class Foobar(int):
return self + 1 return self + 1
test_exc('%o', Foobar(), TypeError, test_exc('%o', Foobar(), TypeError,
"expected string or Unicode object, int found") "expected str object, int found")
if maxsize == 2**31-1: if maxsize == 2**31-1:
# crashes 2.2.1 and earlier: # crashes 2.2.1 and earlier: