Fix SF bug #688424, 64-bit test problems

1 files changed, 71 insertions, 26 deletions

diff --git a/Lib/test/test_hexoct.py b/Lib/test/test_hexoct.py
index 6de36f5..a14a2c2 100644
--- a/Lib/test/test_hexoct.py
+++ b/Lib/test/test_hexoct.py
@@ -5,6 +5,9 @@ This is complex because of changes due to PEP 237.
 Some of these tests will have to change in Python 2.4!
 """
 
+import sys
+platform_long_is_32_bits = sys.maxint == 2147483647
+
 import unittest
 from test import test_support
 
@@ -18,58 +21,100 @@ class TextHexOct(unittest.TestCase):
         # Baseline tests
         self.assertEqual(0x0, 0)
         self.assertEqual(0x10, 16)
-        self.assertEqual(0x7fffffff, 2147483647)
+        if platform_long_is_32_bits:
+            self.assertEqual(0x7fffffff, 2147483647)
+        else:
+            self.assertEqual(0x7fffffffffffffff, 9223372036854775807)
         # Ditto with a minus sign and parentheses
         self.assertEqual(-(0x0), 0)
         self.assertEqual(-(0x10), -16)
-        self.assertEqual(-(0x7fffffff), -2147483647)
+        if platform_long_is_32_bits:
+            self.assertEqual(-(0x7fffffff), -2147483647)
+        else:
+            self.assertEqual(-(0x7fffffffffffffff), -9223372036854775807)
         # Ditto with a minus sign and NO parentheses
         self.assertEqual(-0x0, 0)
         self.assertEqual(-0x10, -16)
-        self.assertEqual(-0x7fffffff, -2147483647)
+        if platform_long_is_32_bits:
+            self.assertEqual(-0x7fffffff, -2147483647)
+        else:
+            self.assertEqual(-0x7fffffffffffffff, -9223372036854775807)
 
     def test_hex_unsigned(self):
         # This test is in a <string> so we can ignore the warnings
         exec """if 1:
-        # Positive-looking constants with negavive values
-        self.assertEqual(0x80000000, -2147483648L)
-        self.assertEqual(0xffffffff, -1)
-        # Ditto with a minus sign and parentheses
-        self.assertEqual(-(0x80000000), 2147483648L)
-        self.assertEqual(-(0xffffffff), 1)
-        # Ditto with a minus sign and NO parentheses
-        # This failed in Python 2.2 through 2.2.2 and in 2.3a1
-        self.assertEqual(-0x80000000, 2147483648L)
-        self.assertEqual(-0xffffffff, 1)
+        if platform_long_is_32_bits:
+            # Positive-looking constants with negavive values
+            self.assertEqual(0x80000000, -2147483648L)
+            self.assertEqual(0xffffffff, -1)
+            # Ditto with a minus sign and parentheses
+            self.assertEqual(-(0x80000000), 2147483648L)
+            self.assertEqual(-(0xffffffff), 1)
+            # Ditto with a minus sign and NO parentheses
+            # This failed in Python 2.2 through 2.2.2 and in 2.3a1
+            self.assertEqual(-0x80000000, 2147483648L)
+            self.assertEqual(-0xffffffff, 1)
+        else:
+            # Positive-looking constants with negavive values
+            self.assertEqual(0x8000000000000000, -9223372036854775808L)
+            self.assertEqual(0xffffffffffffffff, -1)
+            # Ditto with a minus sign and parentheses
+            self.assertEqual(-(0x8000000000000000), 9223372036854775808L)
+            self.assertEqual(-(0xffffffffffffffff), 1)
+            # Ditto with a minus sign and NO parentheses
+            # This failed in Python 2.2 through 2.2.2 and in 2.3a1
+            self.assertEqual(-0x8000000000000000, 9223372036854775808L)
+            self.assertEqual(-0xffffffffffffffff, 1)
         \n"""
 
     def test_oct_baseline(self):
         # Baseline tests
         self.assertEqual(00, 0)
         self.assertEqual(020, 16)
-        self.assertEqual(017777777777, 2147483647)
+        if platform_long_is_32_bits:
+            self.assertEqual(017777777777, 2147483647)
+        else:
+            self.assertEqual(0777777777777777777777, 9223372036854775807)
         # Ditto with a minus sign and parentheses
         self.assertEqual(-(00), 0)
         self.assertEqual(-(020), -16)
-        self.assertEqual(-(017777777777), -2147483647)
+        if platform_long_is_32_bits:
+            self.assertEqual(-(017777777777), -2147483647)
+        else:
+            self.assertEqual(-(0777777777777777777777), -9223372036854775807)
         # Ditto with a minus sign and NO parentheses
         self.assertEqual(-00, 0)
         self.assertEqual(-020, -16)
-        self.assertEqual(-017777777777, -2147483647)
+        if platform_long_is_32_bits:
+            self.assertEqual(-017777777777, -2147483647)
+        else:
+            self.assertEqual(-0777777777777777777777, -9223372036854775807)
 
     def test_oct_unsigned(self):
         # This test is in a <string> so we can ignore the warnings
         exec """if 1:
-        # Positive-looking constants with negavive values
-        self.assertEqual(020000000000, -2147483648L)
-        self.assertEqual(037777777777, -1)
-        # Ditto with a minus sign and parentheses
-        self.assertEqual(-(020000000000), 2147483648L)
-        self.assertEqual(-(037777777777), 1)
-        # Ditto with a minus sign and NO parentheses
-        # This failed in Python 2.2 through 2.2.2 and in 2.3a1
-        self.assertEqual(-020000000000, 2147483648L)
-        self.assertEqual(-037777777777, 1)
+        if platform_long_is_32_bits:
+            # Positive-looking constants with negavive values
+            self.assertEqual(020000000000, -2147483648L)
+            self.assertEqual(037777777777, -1)
+            # Ditto with a minus sign and parentheses
+            self.assertEqual(-(020000000000), 2147483648L)
+            self.assertEqual(-(037777777777), 1)
+            # Ditto with a minus sign and NO parentheses
+            # This failed in Python 2.2 through 2.2.2 and in 2.3a1
+            self.assertEqual(-020000000000, 2147483648L)
+            self.assertEqual(-037777777777, 1)
+        else:
+            # Positive-looking constants with negavive values
+            self.assertEqual(01000000000000000000000, -9223372036854775808L)
+            self.assertEqual(01777777777777777777777, -1)
+            # Ditto with a minus sign and parentheses
+            self.assertEqual(-(01000000000000000000000), 9223372036854775808L)
+            self.assertEqual(-(01777777777777777777777), 1)
+            # Ditto with a minus sign and NO parentheses
+            # This failed in Python 2.2 through 2.2.2 and in 2.3a1
+            self.assertEqual(-01000000000000000000000, 9223372036854775808L)
+            self.assertEqual(-01777777777777777777777, 1)
         \n"""
 
 def test_main():