Issue 4842, patch 2/2: int('3L') should be invalid in Python 3.x.
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
index ed8c886..c1f8b5c 100644
--- a/Lib/test/test_long.py
+++ b/Lib/test/test_long.py
@@ -284,6 +284,16 @@
self.assertRaises(ValueError, int, '123\0')
self.assertRaises(ValueError, int, '53', 40)
+ # trailing L should no longer be accepted...
+ self.assertRaises(ValueError, int, '123L')
+ self.assertRaises(ValueError, int, '123l')
+ self.assertRaises(ValueError, int, '0L')
+ self.assertRaises(ValueError, int, '-37L')
+ self.assertRaises(ValueError, int, '0x32L', 16)
+ self.assertRaises(ValueError, int, '1L', 21)
+ # ... but it's just a normal digit if base >= 22
+ self.assertEqual(int('1L', 22), 43)
+
self.assertRaises(TypeError, int, 1, 12)
# SF patch #1638879: embedded NULs were not detected with
diff --git a/Misc/NEWS b/Misc/NEWS
index d20d20b..9ffe6be 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #4842: Don't allow trailing 'L' when constructing an integer
+ from a string.
+
- Issue #4991: os.fdopen now raises an OSError for invalid file descriptors.
- Issue #4838: When a module is deallocated, free the memory backing the
diff --git a/Objects/longobject.c b/Objects/longobject.c
index b7ba796..46efe5f 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -1990,8 +1990,6 @@
goto onError;
if (sign < 0)
Py_SIZE(z) = -(Py_SIZE(z));
- if (*str == 'L' || *str == 'l')
- str++;
while (*str && isspace(Py_CHARMASK(*str)))
str++;
if (*str != '\0')