1 files changed, 82 insertions, 37 deletions
diff --git a/Lib/test/test_int_literal.py b/Lib/test/test_int_literal.py
index bf72571..e65cc7c 100644
--- a/Lib/test/test_int_literal.py
+++ b/Lib/test/test_int_literal.py
@@ -4,6 +4,8 @@ This is complex because of changes due to PEP 237.
 """
 
 import unittest
+from test import test_support
+
 
 class TestHexOctBin(unittest.TestCase):
 
@@ -30,28 +32,45 @@ class TestHexOctBin(unittest.TestCase):
 
     def test_hex_unsigned(self):
         # Positive constants
-        self.assertEqual(0x80000000, 2147483648)
-        self.assertEqual(0xffffffff, 4294967295)
+        self.assertEqual(0x80000000, 2147483648L)
+        self.assertEqual(0xffffffff, 4294967295L)
         # Ditto with a minus sign and parentheses
-        self.assertEqual(-(0x80000000), -2147483648)
-        self.assertEqual(-(0xffffffff), -4294967295)
+        self.assertEqual(-(0x80000000), -2147483648L)
+        self.assertEqual(-(0xffffffff), -4294967295L)
         # 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, -2147483648)
-        self.assertEqual(-0xffffffff, -4294967295)
+        self.assertEqual(-0x80000000, -2147483648L)
+        self.assertEqual(-0xffffffff, -4294967295L)
 
         # Positive constants
-        self.assertEqual(0x8000000000000000, 9223372036854775808)
-        self.assertEqual(0xffffffffffffffff, 18446744073709551615)
+        self.assertEqual(0x8000000000000000, 9223372036854775808L)
+        self.assertEqual(0xffffffffffffffff, 18446744073709551615L)
         # Ditto with a minus sign and parentheses
-        self.assertEqual(-(0x8000000000000000), -9223372036854775808)
-        self.assertEqual(-(0xffffffffffffffff), -18446744073709551615)
+        self.assertEqual(-(0x8000000000000000), -9223372036854775808L)
+        self.assertEqual(-(0xffffffffffffffff), -18446744073709551615L)
         # 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, -9223372036854775808)
-        self.assertEqual(-0xffffffffffffffff, -18446744073709551615)
+        self.assertEqual(-0x8000000000000000, -9223372036854775808L)
+        self.assertEqual(-0xffffffffffffffff, -18446744073709551615L)
 
     def test_oct_baseline(self):
+        # Baseline tests
+        self.assertEqual(00, 0)
+        self.assertEqual(020, 16)
+        self.assertEqual(017777777777, 2147483647)
+        self.assertEqual(0777777777777777777777, 9223372036854775807)
+        # Ditto with a minus sign and parentheses
+        self.assertEqual(-(00), 0)
+        self.assertEqual(-(020), -16)
+        self.assertEqual(-(017777777777), -2147483647)
+        self.assertEqual(-(0777777777777777777777), -9223372036854775807)
+        # Ditto with a minus sign and NO parentheses
+        self.assertEqual(-00, 0)
+        self.assertEqual(-020, -16)
+        self.assertEqual(-017777777777, -2147483647)
+        self.assertEqual(-0777777777777777777777, -9223372036854775807)
+
+    def test_oct_baseline_new(self):
         # A few upper/lowercase tests
         self.assertEqual(0o0, 0O0)
         self.assertEqual(0o1, 0O1)
@@ -74,26 +93,49 @@ class TestHexOctBin(unittest.TestCase):
 
     def test_oct_unsigned(self):
         # Positive constants
-        self.assertEqual(0o20000000000, 2147483648)
-        self.assertEqual(0o37777777777, 4294967295)
+        self.assertEqual(020000000000, 2147483648L)
+        self.assertEqual(037777777777, 4294967295L)
+        # Ditto with a minus sign and parentheses
+        self.assertEqual(-(020000000000), -2147483648L)
+        self.assertEqual(-(037777777777), -4294967295L)
+        # 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, -4294967295L)
+
+        # Positive constants
+        self.assertEqual(01000000000000000000000, 9223372036854775808L)
+        self.assertEqual(01777777777777777777777, 18446744073709551615L)
+        # Ditto with a minus sign and parentheses
+        self.assertEqual(-(01000000000000000000000), -9223372036854775808L)
+        self.assertEqual(-(01777777777777777777777), -18446744073709551615L)
+        # 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, -18446744073709551615L)
+
+    def test_oct_unsigned_new(self):
+        # Positive constants
+        self.assertEqual(0o20000000000, 2147483648L)
+        self.assertEqual(0o37777777777, 4294967295L)
         # Ditto with a minus sign and parentheses
-        self.assertEqual(-(0o20000000000), -2147483648)
-        self.assertEqual(-(0o37777777777), -4294967295)
+        self.assertEqual(-(0o20000000000), -2147483648L)
+        self.assertEqual(-(0o37777777777), -4294967295L)
         # Ditto with a minus sign and NO parentheses
         # This failed in Python 2.2 through 2.2.2 and in 2.3a1
-        self.assertEqual(-0o20000000000, -2147483648)
-        self.assertEqual(-0o37777777777, -4294967295)
+        self.assertEqual(-0o20000000000, -2147483648L)
+        self.assertEqual(-0o37777777777, -4294967295L)
 
         # Positive constants
-        self.assertEqual(0o1000000000000000000000, 9223372036854775808)
-        self.assertEqual(0o1777777777777777777777, 18446744073709551615)
+        self.assertEqual(0o1000000000000000000000, 9223372036854775808L)
+        self.assertEqual(0o1777777777777777777777, 18446744073709551615L)
         # Ditto with a minus sign and parentheses
-        self.assertEqual(-(0o1000000000000000000000), -9223372036854775808)
-        self.assertEqual(-(0o1777777777777777777777), -18446744073709551615)
+        self.assertEqual(-(0o1000000000000000000000), -9223372036854775808L)
+        self.assertEqual(-(0o1777777777777777777777), -18446744073709551615L)
         # Ditto with a minus sign and NO parentheses
         # This failed in Python 2.2 through 2.2.2 and in 2.3a1
-        self.assertEqual(-0o1000000000000000000000, -9223372036854775808)
-        self.assertEqual(-0o1777777777777777777777, -18446744073709551615)
+        self.assertEqual(-0o1000000000000000000000, -9223372036854775808L)
+        self.assertEqual(-0o1777777777777777777777, -18446744073709551615L)
 
     def test_bin_baseline(self):
         # A few upper/lowercase tests
@@ -118,26 +160,29 @@ class TestHexOctBin(unittest.TestCase):
 
     def test_bin_unsigned(self):
         # Positive constants
-        self.assertEqual(0b10000000000000000000000000000000, 2147483648)
-        self.assertEqual(0b11111111111111111111111111111111, 4294967295)
+        self.assertEqual(0b10000000000000000000000000000000, 2147483648L)
+        self.assertEqual(0b11111111111111111111111111111111, 4294967295L)
         # Ditto with a minus sign and parentheses
-        self.assertEqual(-(0b10000000000000000000000000000000), -2147483648)
-        self.assertEqual(-(0b11111111111111111111111111111111), -4294967295)
+        self.assertEqual(-(0b10000000000000000000000000000000), -2147483648L)
+        self.assertEqual(-(0b11111111111111111111111111111111), -4294967295L)
         # Ditto with a minus sign and NO parentheses
         # This failed in Python 2.2 through 2.2.2 and in 2.3a1
-        self.assertEqual(-0b10000000000000000000000000000000, -2147483648)
-        self.assertEqual(-0b11111111111111111111111111111111, -4294967295)
+        self.assertEqual(-0b10000000000000000000000000000000, -2147483648L)
+        self.assertEqual(-0b11111111111111111111111111111111, -4294967295L)
 
         # Positive constants
-        self.assertEqual(0b1000000000000000000000000000000000000000000000000000000000000000, 9223372036854775808)
-        self.assertEqual(0b1111111111111111111111111111111111111111111111111111111111111111, 18446744073709551615)
+        self.assertEqual(0b1000000000000000000000000000000000000000000000000000000000000000, 9223372036854775808L)
+        self.assertEqual(0b1111111111111111111111111111111111111111111111111111111111111111, 18446744073709551615L)
         # Ditto with a minus sign and parentheses
-        self.assertEqual(-(0b1000000000000000000000000000000000000000000000000000000000000000), -9223372036854775808)
-        self.assertEqual(-(0b1111111111111111111111111111111111111111111111111111111111111111), -18446744073709551615)
+        self.assertEqual(-(0b1000000000000000000000000000000000000000000000000000000000000000), -9223372036854775808L)
+        self.assertEqual(-(0b1111111111111111111111111111111111111111111111111111111111111111), -18446744073709551615L)
         # Ditto with a minus sign and NO parentheses
         # This failed in Python 2.2 through 2.2.2 and in 2.3a1
-        self.assertEqual(-0b1000000000000000000000000000000000000000000000000000000000000000, -9223372036854775808)
-        self.assertEqual(-0b1111111111111111111111111111111111111111111111111111111111111111, -18446744073709551615)
+        self.assertEqual(-0b1000000000000000000000000000000000000000000000000000000000000000, -9223372036854775808L)
+        self.assertEqual(-0b1111111111111111111111111111111111111111111111111111111111111111, -18446744073709551615L)
+
+def test_main():
+    test_support.run_unittest(TestHexOctBin)
 
 if __name__ == "__main__":
-    unittest.main()
+    test_main()