diff options
author | Mark Hammond <mhammond@skippinet.com.au> | 2008-08-23 00:59:14 (GMT) |
---|---|---|
committer | Mark Hammond <mhammond@skippinet.com.au> | 2008-08-23 00:59:14 (GMT) |
commit | 69ed5240451b5e9642ddc87bb6b0ca2d2e47d784 (patch) | |
tree | 1d9342e923d4c6aa01cd1cdff83c845b6af945f3 | |
parent | 94a730540ae65b34c596d99e4dd199bfaee4332c (diff) | |
download | cpython-69ed5240451b5e9642ddc87bb6b0ca2d2e47d784.zip cpython-69ed5240451b5e9642ddc87bb6b0ca2d2e47d784.tar.gz cpython-69ed5240451b5e9642ddc87bb6b0ca2d2e47d784.tar.bz2 |
Fix bug 3625: test issues on 64bit windows. r=pitrou
-rw-r--r-- | Lib/test/test_bytes.py | 2 | ||||
-rw-r--r-- | Lib/test/test_list.py | 2 | ||||
-rw-r--r-- | Lib/test/test_struct.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index 6604b1e..2873bea 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -213,7 +213,7 @@ class BaseBytesTest(unittest.TestCase): self.assertRaises(TypeError, lambda: 3.14 * b) # XXX Shouldn't bytes and bytearray agree on what to raise? self.assertRaises((OverflowError, MemoryError), - lambda: b * sys.maxint) + lambda: b * sys.maxsize) def test_repeat_1char(self): self.assertEqual(self.type2test(b'x')*100, self.type2test([ord('x')]*100)) diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py index 336baec..167293a 100644 --- a/Lib/test/test_list.py +++ b/Lib/test/test_list.py @@ -15,7 +15,7 @@ class ListTest(list_tests.CommonTest): self.assertEqual(list(''), []) self.assertEqual(list('spam'), ['s', 'p', 'a', 'm']) - if sys.maxint == 0x7fffffff: + if sys.maxsize == 0x7fffffff: # This test can currently only work on 32-bit machines. # XXX If/when PySequence_Length() returns a ssize_t, it should be # XXX re-enabled. diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 5e4f0cc..ec4a2db 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -8,7 +8,7 @@ from test.test_support import TestFailed, verbose, run_unittest, catch_warning import sys ISBIGENDIAN = sys.byteorder == "big" -IS32BIT = sys.maxint == 0x7fffffff +IS32BIT = sys.maxsize == 0x7fffffff del sys try: |