From 0b386d524765d875fd5f7b6150219e5e5cd69abf Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Fri, 28 Dec 2012 09:42:11 +0200 Subject: Issue #16761: Raise TypeError when int() called with base argument only. --- Lib/test/test_int.py | 8 ++++++++ Misc/NEWS | 3 +++ Objects/longobject.c | 10 ++++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py index 4f2224b..671b20a 100644 --- a/Lib/test/test_int.py +++ b/Lib/test/test_int.py @@ -226,6 +226,14 @@ class IntTestCases(unittest.TestCase): self.assertIs(int(b'10'), 10) self.assertIs(int(b'-1'), -1) + def test_keyword_args(self): + # Test invoking int() using keyword arguments. + self.assertEqual(int(x=1.2), 1) + self.assertEqual(int('100', base=2), 4) + self.assertEqual(int(x='100', base=2), 4) + self.assertRaises(TypeError, int, base=10) + self.assertRaises(TypeError, int, base=0) + def test_intconversion(self): # Test __int__() class ClassicMissingMethods: diff --git a/Misc/NEWS b/Misc/NEWS index 3efa292..356e586 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 3.2.4 Core and Builtins ----------------- +- Issue #16761: Calling ``int()`` with *base* argument only now raises + TypeError. + - Issue #16759: Support the full DWORD (unsigned long) range in Reg2Py when retreiving a REG_DWORD value. This corrects functions like winreg.QueryValueEx that may have been returning truncated values. 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 @@ long_new(PyTypeObject *type, PyObject *args, PyObject *kwds) 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 @@ long_new(PyTypeObject *type, PyObject *args, PyObject *kwds) 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; } -- cgit v0.12