Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c2a2a751
Commit
c2a2a751
authored
Apr 23, 2016
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #26822: itemgetter, attrgetter and methodcaller objects no longer
silently ignore keyword arguments.
parent
95b5f0ad
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
0 deletions
+18
-0
Lib/test/test_operator.py
Lib/test/test_operator.py
+9
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_operator.c
Modules/_operator.c
+6
-0
No files found.
Lib/test/test_operator.py
View file @
c2a2a751
...
...
@@ -318,6 +318,9 @@ class OperatorTestCase:
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 @@ class OperatorTestCase:
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 @@ class OperatorTestCase:
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
)
...
...
Misc/NEWS
View file @
c2a2a751
...
...
@@ -107,6 +107,9 @@ Core and Builtins
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.
...
...
Modules/_operator.c
View file @
c2a2a751
...
...
@@ -460,6 +460,8 @@ itemgetter_call(itemgetterobject *ig, PyObject *args, PyObject *kw)
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 @@ attrgetter_call(attrgetterobject *ag, PyObject *args, PyObject *kw)
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 @@ methodcaller_call(methodcallerobject *mc, PyObject *args, PyObject *kw)
{
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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment