[Python-checkins] r65986 - in python/trunk/Lib/test: test_bytes.py test_list.py test_struct.py

[mark.hammond]

Author: mark.hammond
Date: Sat Aug 23 02:59:14 2008
New Revision: 65986

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


Modified:
   python/trunk/Lib/test/test_bytes.py
   python/trunk/Lib/test/test_list.py
   python/trunk/Lib/test/test_struct.py

Modified: python/trunk/Lib/test/test_bytes.py
==============================================================================
--- python/trunk/Lib/test/test_bytes.py	(original)
+++ python/trunk/Lib/test/test_bytes.py	Sat Aug 23 02:59:14 2008
@@ -213,7 +213,7 @@
             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))

Modified: python/trunk/Lib/test/test_list.py
==============================================================================
--- python/trunk/Lib/test/test_list.py	(original)
+++ python/trunk/Lib/test/test_list.py	Sat Aug 23 02:59:14 2008
@@ -15,7 +15,7 @@
         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.

Modified: python/trunk/Lib/test/test_struct.py
==============================================================================
--- python/trunk/Lib/test/test_struct.py	(original)
+++ python/trunk/Lib/test/test_struct.py	Sat Aug 23 02:59:14 2008
@@ -8,7 +8,7 @@
 
 import sys
 ISBIGENDIAN = sys.byteorder == "big"
-IS32BIT = sys.maxint == 0x7fffffff
+IS32BIT = sys.maxsize == 0x7fffffff
 del sys
 
 try: