[Python-checkins] cpython (merge 3.5 -> default): Issue #26822: itemgetter, attrgetter and methodcaller objects no longer

Sat Apr 23 03:54:05 EDT 2016

https://hg.python.org/cpython/rev/5faccb403ad8
changeset: 101102:5faccb403ad8
parent: 101098:df0e900b8860
parent: 101100:16461a0016bf
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sat Apr 23 10:53:43 2016 +0300
summary:
 Issue #26822: itemgetter, attrgetter and methodcaller objects no longer
silently ignore keyword arguments.
files:
 Lib/test/test_operator.py | 9 +++++++++
 Misc/NEWS | 3 +++
 Modules/_operator.c | 6 ++++++
 3 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py
--- a/Lib/test/test_operator.py
+++ b/Lib/test/test_operator.py
@@ -318,6 +318,9 @@
 a.name = 'arthur'
 f = operator.attrgetter('name')
 self.assertEqual(f(a), 'arthur')
+ self.assertRaises(TypeError, f)
+ self.assertRaises(TypeError, f, a, 'dent')
+ self.assertRaises(TypeError, f, a, surname='dent')
 f = operator.attrgetter('rank')
 self.assertRaises(AttributeError, f, a)
 self.assertRaises(TypeError, operator.attrgetter, 2)
@@ -365,6 +368,9 @@
 a = 'ABCDE'
 f = operator.itemgetter(2)
 self.assertEqual(f(a), 'C')
+ self.assertRaises(TypeError, f)
+ self.assertRaises(TypeError, f, a, 3)
+ self.assertRaises(TypeError, f, a, size=3)
 f = operator.itemgetter(10)
 self.assertRaises(IndexError, f, a)
 
@@ -411,6 +417,9 @@
 self.assertRaises(IndexError, f, a)
 f = operator.methodcaller('foo', 1, 2)
 self.assertEqual(f(a), 3)
+ self.assertRaises(TypeError, f)
+ self.assertRaises(TypeError, f, a, 3)
+ self.assertRaises(TypeError, f, a, spam=3)
 f = operator.methodcaller('bar')
 self.assertEqual(f(a), 42)
 self.assertRaises(TypeError, f, a, a)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -256,6 +256,9 @@
 Library
 -------
 
+- Issue #26822: itemgetter, attrgetter and methodcaller objects no longer
+ silently ignore keyword arguments.
+
 - Issue #26733: Disassembling a class now disassembles class and static methods.
 Patch by Xiang Zhang.
 
diff --git a/Modules/_operator.c b/Modules/_operator.c
--- a/Modules/_operator.c
+++ b/Modules/_operator.c
@@ -460,6 +460,8 @@
 PyObject *obj, *result;
 Py_ssize_t i, nitems=ig->nitems;
 
+ if (!_PyArg_NoKeywords("itemgetter", kw))
+ return NULL;
 if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &obj))
 return NULL;
 if (nitems == 1)
@@ -747,6 +749,8 @@
 PyObject *obj, *result;
 Py_ssize_t i, nattrs=ag->nattrs;
 
+ if (!_PyArg_NoKeywords("attrgetter", kw))
+ return NULL;
 if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &obj))
 return NULL;
 if (ag->nattrs == 1) /* ag->attr is always a tuple */
@@ -988,6 +992,8 @@
 {
 PyObject *method, *obj, *result;
 
+ if (!_PyArg_NoKeywords("methodcaller", kw))
+ return NULL;
 if (!PyArg_UnpackTuple(args, "methodcaller", 1, 1, &obj))
 return NULL;
 method = PyObject_GetAttr(obj, mc->name);
-- 
Repository URL: https://hg.python.org/cpython
