Rip out 'long' and 'L'-suffixed integer literals.
(Rough first cut.)
diff --git a/Lib/test/test_hexoct.py b/Lib/test/test_hexoct.py
index f71dbe0..5e86bea 100644
--- a/Lib/test/test_hexoct.py
+++ b/Lib/test/test_hexoct.py
@@ -41,26 +41,26 @@
def test_hex_unsigned(self):
if platform_long_is_32_bits:
# Positive constants
- self.assertEqual(0x80000000, 2147483648L)
- self.assertEqual(0xffffffff, 4294967295L)
+ self.assertEqual(0x80000000, 2147483648)
+ self.assertEqual(0xffffffff, 4294967295)
# Ditto with a minus sign and parentheses
- self.assertEqual(-(0x80000000), -2147483648L)
- self.assertEqual(-(0xffffffff), -4294967295L)
+ self.assertEqual(-(0x80000000), -2147483648)
+ self.assertEqual(-(0xffffffff), -4294967295)
# 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, -4294967295L)
+ self.assertEqual(-0x80000000, -2147483648)
+ self.assertEqual(-0xffffffff, -4294967295)
else:
# Positive constants
- self.assertEqual(0x8000000000000000, 9223372036854775808L)
- self.assertEqual(0xffffffffffffffff, 18446744073709551615L)
+ self.assertEqual(0x8000000000000000, 9223372036854775808)
+ self.assertEqual(0xffffffffffffffff, 18446744073709551615)
# Ditto with a minus sign and parentheses
- self.assertEqual(-(0x8000000000000000), -9223372036854775808L)
- self.assertEqual(-(0xffffffffffffffff), -18446744073709551615L)
+ self.assertEqual(-(0x8000000000000000), -9223372036854775808)
+ self.assertEqual(-(0xffffffffffffffff), -18446744073709551615)
# 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, -18446744073709551615L)
+ self.assertEqual(-0x8000000000000000, -9223372036854775808)
+ self.assertEqual(-0xffffffffffffffff, -18446744073709551615)
def test_oct_baseline(self):
# Baseline tests
@@ -88,26 +88,26 @@
def test_oct_unsigned(self):
if platform_long_is_32_bits:
# Positive constants
- self.assertEqual(020000000000, 2147483648L)
- self.assertEqual(037777777777, 4294967295L)
+ self.assertEqual(020000000000, 2147483648)
+ self.assertEqual(037777777777, 4294967295)
# Ditto with a minus sign and parentheses
- self.assertEqual(-(020000000000), -2147483648L)
- self.assertEqual(-(037777777777), -4294967295L)
+ self.assertEqual(-(020000000000), -2147483648)
+ self.assertEqual(-(037777777777), -4294967295)
# 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)
+ self.assertEqual(-020000000000, -2147483648)
+ self.assertEqual(-037777777777, -4294967295)
else:
# Positive constants
- self.assertEqual(01000000000000000000000, 9223372036854775808L)
- self.assertEqual(01777777777777777777777, 18446744073709551615L)
+ self.assertEqual(01000000000000000000000, 9223372036854775808)
+ self.assertEqual(01777777777777777777777, 18446744073709551615)
# Ditto with a minus sign and parentheses
- self.assertEqual(-(01000000000000000000000), -9223372036854775808L)
- self.assertEqual(-(01777777777777777777777), -18446744073709551615L)
+ self.assertEqual(-(01000000000000000000000), -9223372036854775808)
+ self.assertEqual(-(01777777777777777777777), -18446744073709551615)
# 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)
+ self.assertEqual(-01000000000000000000000, -9223372036854775808)
+ self.assertEqual(-01777777777777777777777, -18446744073709551615)
def test_main():
test_support.run_unittest(TextHexOct)