diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:40:42 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:40:42 -0600 |
| commit | 1f7df8f2070391f28391e3594580c07e11b6b32b (patch) | |
| tree | ec03dfe4f71df3840232731145b8f6736fc6a314 /Objects/intobject.c | |
| parent | b25d611f8d9140e83acbfffb6b0579939c88c033 (diff) | |
| parent | 10e93a6d40502e100c68090730e0b3190df97854 (diff) | |
| download | cpython-git-1f7df8f2070391f28391e3594580c07e11b6b32b.tar.gz | |
merge heads
Diffstat (limited to 'Objects/intobject.c')
| -rw-r--r-- | Objects/intobject.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Objects/intobject.c b/Objects/intobject.c index 74955adbef..1ae8006c28 100644 --- a/Objects/intobject.c +++ b/Objects/intobject.c @@ -1059,8 +1059,14 @@ int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi:int", kwlist, &x, &base)) return NULL; - if (x == NULL) + if (x == NULL) { + if (base != -909) { + PyErr_SetString(PyExc_TypeError, + "int() missing string argument"); + return NULL; + } return PyInt_FromLong(0L); + } if (base == -909) return PyNumber_Int(x); if (PyString_Check(x)) { |