diff options
| author | Fred Drake <fdrake@acm.org> | 1999-12-23 15:36:42 (GMT) |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 1999-12-23 15:36:42 (GMT) |
| commit | db1bd5c230e2ed71b95939e61a09271887b03b31 (patch) | |
| tree | d663825929482bb9f166b49900bd7e0a78a4d72c /Lib | |
| parent | b06007a3ba0dcc3bfdc50131a0729dd21882a4ea (diff) | |
| download | cpython-db1bd5c230e2ed71b95939e61a09271887b03b31.zip cpython-db1bd5c230e2ed71b95939e61a09271887b03b31.tar.gz cpython-db1bd5c230e2ed71b95939e61a09271887b03b31.tar.bz2 | |
Revise tests to support str(<long int object>) not appending "L".
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_b2.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_long.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_pow.py | 24 |
3 files changed, 21 insertions, 15 deletions
diff --git a/Lib/test/test_b2.py b/Lib/test/test_b2.py index 3b322a5..1aff837 100644 --- a/Lib/test/test_b2.py +++ b/Lib/test/test_b2.py @@ -209,7 +209,7 @@ if sys.spam != 1: raise TestFailed, 'setattr(sys, \'spam\', 1)' print 'str' if str('') <> '': raise TestFailed, 'str(\'\')' if str(0) <> '0': raise TestFailed, 'str(0)' -if str(0L) <> '0L': raise TestFailed, 'str(0L)' +if str(0L) <> '0': raise TestFailed, 'str(0L)' if str(()) <> '()': raise TestFailed, 'str(())' if str([]) <> '[]': raise TestFailed, 'str([])' if str({}) <> '{}': raise TestFailed, 'str({})' diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py index f235d9c..25abcc8 100644 --- a/Lib/test/test_long.py +++ b/Lib/test/test_long.py @@ -159,7 +159,7 @@ def test_bitop_identities(maxdigits=MAXDIGITS): test_bitop_identities_2(x, y) test_bitop_identities_3(x, y, getran((lenx + leny)/2)) -# ------------------------------------------------------ hex oct str atol +# ------------------------------------------------- hex oct repr str atol def slow_format(x, base): if (x, base) == (0, 8): @@ -181,12 +181,18 @@ def slow_format(x, base): def test_format_1(x): from string import atol - for base, mapper in (8, oct), (10, str), (16, hex): + for base, mapper in (8, oct), (10, repr), (16, hex): got = mapper(x) expected = slow_format(x, base) check(got == expected, mapper.__name__, "returned", got, "but expected", expected, "for", x) check(atol(got, 0) == x, 'atol("%s", 0) !=' % got, x) + # str() has to be checked a little differently since there's no + # trailing "L" + got = str(x) + expected = slow_format(x, 10)[:-1] + check(got == expected, mapper.__name__, "returned", + got, "but expected", expected, "for", x) def test_format(maxdigits=MAXDIGITS): print "long str/hex/oct/atol" diff --git a/Lib/test/test_pow.py b/Lib/test/test_pow.py index ec17d53..6e3dda7 100644 --- a/Lib/test/test_pow.py +++ b/Lib/test/test_pow.py @@ -56,20 +56,20 @@ powtest(float) # Other tests-- not very systematic print 'The number in both columns should match.' -print pow(3,3) % 8, pow(3,3,8) -print pow(3,3) % -8, pow(3,3,-8) -print pow(3,2) % -2, pow(3,2,-2) -print pow(-3,3) % 8, pow(-3,3,8) -print pow(-3,3) % -8, pow(-3,3,-8) -print pow(5,2) % -8, pow(5,2,-8) +print `pow(3,3) % 8`, `pow(3,3,8)` +print `pow(3,3) % -8`, `pow(3,3,-8)` +print `pow(3,2) % -2`, `pow(3,2,-2)` +print `pow(-3,3) % 8`, `pow(-3,3,8)` +print `pow(-3,3) % -8`, `pow(-3,3,-8)` +print `pow(5,2) % -8`, `pow(5,2,-8)` print -print pow(3L,3L) % 8, pow(3L,3L,8) -print pow(3L,3L) % -8, pow(3L,3L,-8) -print pow(3L,2) % -2, pow(3L,2,-2) -print pow(-3L,3L) % 8, pow(-3L,3L,8) -print pow(-3L,3L) % -8, pow(-3L,3L,-8) -print pow(5L,2) % -8, pow(5L,2,-8) +print `pow(3L,3L) % 8`, `pow(3L,3L,8)` +print `pow(3L,3L) % -8`, `pow(3L,3L,-8)` +print `pow(3L,2) % -2`, `pow(3L,2,-2)` +print `pow(-3L,3L) % 8`, `pow(-3L,3L,8)` +print `pow(-3L,3L) % -8`, `pow(-3L,3L,-8)` +print `pow(5L,2) % -8`, `pow(5L,2,-8)` print print pow(3.0,3.0) % 8, pow(3.0,3.0,8) |