From: Mark Hammond <mhammond@skippinet.com.au>
Date: Sat, 23 Aug 2008 00:59:14 +0000 (+0000)
Subject: Fix bug 3625: test issues on 64bit windows. r=pitrou
X-Git-Tag: v2.6rc1~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69ed5240451b5e9642ddc87bb6b0ca2d2e47d784;p=python

Fix bug 3625: test issues on 64bit windows. r=pitrou
---

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 6604b1eacf..2873beaf50 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 336baec795..167293a168 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 5e4f0cccc3..ec4a2dbc43 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: