commit 0b386d524765d875fd5f7b6150219e5e5cd69abf
author Serhiy Storchaka <storchaka@gmail.com> Fri Dec 28 09:42:11 2012 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Fri Dec 28 09:42:11 2012 +0200
tree 685ff50538e96318e1f9384448e2b5a5aedfb302
parent 1e4bd53a34a46e44a5e88a6ecc5ea4f102b94b6f

Issue #16761: Raise TypeError when int() called with base argument only.

Objects/longobject.c

diff --git a/Objects/longobject.c b/Objects/longobject.c
index 3a675c4..51da329 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -4130,8 +4130,14 @@
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OO:int", kwlist,
                                      &x, &obase))
         return NULL;
-    if (x == NULL)
+    if (x == NULL) {
+        if (obase != NULL) {
+            PyErr_SetString(PyExc_TypeError,
+                            "int() missing string argument");
+            return NULL;
+        }
         return PyLong_FromLong(0L);
+    }
     if (obase == NULL)
         return PyNumber_Long(x);
 
@@ -4140,7 +4146,7 @@
         return NULL;
     if (overflow || (base != 0 && base < 2) || base > 36) {
         PyErr_SetString(PyExc_ValueError,
-                        "int() arg 2 must be >= 2 and <= 36");
+                        "int() base must be >= 2 and <= 36");
         return NULL;
     }