Issue #26822: itemgetter, attrgetter and methodcaller objects no longer · python-emscripten/cpython@c2a2a75 · GitHub

1. python-emscripten
2. cpython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit c2a2a75

Browse filesBrowse the repository at this point in the historyBrowse files

serhiy-storchaka

committed

Issue python#26822: itemgetter, attrgetter and methodcaller objects no longer

silently ignore keyword arguments.

1 parent 95b5f0a commit c2a2a75
Copy full SHA for c2a2a75

3 files changed

+18Lines changed: 18 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib/test
  • test_operator.py
• Misc
  • NEWS
• Modules
  • _operator.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/test/test_operator.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_operator.py

+9Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -318,6 +318,9 @@ class A:
318	318	a.name = 'arthur'
319	319	f = operator.attrgetter('name')
320	320	self.assertEqual(f(a), 'arthur')
	321	+ self.assertRaises(TypeError, f)
	322	+ self.assertRaises(TypeError, f, a, 'dent')
	323	+ self.assertRaises(TypeError, f, a, surname='dent')
321	324	f = operator.attrgetter('rank')
322	325	self.assertRaises(AttributeError, f, a)
323	326	self.assertRaises(TypeError, operator.attrgetter, 2)
@@ -365,6 +368,9 @@ def test_itemgetter(self):
365	368	a = 'ABCDE'
366	369	f = operator.itemgetter(2)
367	370	self.assertEqual(f(a), 'C')
	371	+ self.assertRaises(TypeError, f)
	372	+ self.assertRaises(TypeError, f, a, 3)
	373	+ self.assertRaises(TypeError, f, a, size=3)
368	374	f = operator.itemgetter(10)
369	375	self.assertRaises(IndexError, f, a)
370	376
@@ -411,6 +417,9 @@ def baz(*args, **kwds):
411	417	self.assertRaises(IndexError, f, a)
412	418	f = operator.methodcaller('foo', 1, 2)
413	419	self.assertEqual(f(a), 3)
	420	+ self.assertRaises(TypeError, f)
	421	+ self.assertRaises(TypeError, f, a, 3)
	422	+ self.assertRaises(TypeError, f, a, spam=3)
414	423	f = operator.methodcaller('bar')
415	424	self.assertEqual(f(a), 42)
416	425	self.assertRaises(TypeError, f, a, a)

Collapse file

‎Misc/NEWS‎

Copy file name to clipboardExpand all lines: Misc/NEWS

+3Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -107,6 +107,9 @@ Core and Builtins
107	107	Library
108	108	-------
109	109
	110	+ - Issue #26822: itemgetter, attrgetter and methodcaller objects no longer
	111	+ silently ignore keyword arguments.
	112	+
110	113	- Issue #26733: Disassembling a class now disassembles class and static methods.
111	114	Patch by Xiang Zhang.
112	115

Collapse file

‎Modules/_operator.c‎

Copy file name to clipboardExpand all lines: Modules/_operator.c

+6Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -460,6 +460,8 @@ itemgetter_call(itemgetterobject *ig, PyObject *args, PyObject *kw)
460	460	PyObject *obj, *result;
461	461	Py_ssize_t i, nitems=ig->nitems;
462	462
	463	+ if (!_PyArg_NoKeywords("itemgetter", kw))
	464	+ return NULL;
463	465	if (!PyArg_UnpackTuple(args, "itemgetter", 1, 1, &obj))
464	466	return NULL;
465	467	if (nitems == 1)
@@ -747,6 +749,8 @@ attrgetter_call(attrgetterobject *ag, PyObject *args, PyObject *kw)
747	749	PyObject *obj, *result;
748	750	Py_ssize_t i, nattrs=ag->nattrs;
749	751
	752	+ if (!_PyArg_NoKeywords("attrgetter", kw))
	753	+ return NULL;
750	754	if (!PyArg_UnpackTuple(args, "attrgetter", 1, 1, &obj))
751	755	return NULL;
752	756	if (ag->nattrs == 1) /* ag->attr is always a tuple */
@@ -988,6 +992,8 @@ methodcaller_call(methodcallerobject *mc, PyObject *args, PyObject *kw)
988	992	{
989	993	PyObject *method, *obj, *result;
990	994
	995	+ if (!_PyArg_NoKeywords("methodcaller", kw))
	996	+ return NULL;
991	997	if (!PyArg_UnpackTuple(args, "methodcaller", 1, 1, &obj))
992	998	return NULL;
993	999	method = PyObject_GetAttr(obj, mc->name);

0 commit comments

Comments

0 (0)