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
77d46607
Commit
77d46607
authored
Mar 28, 2011
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct handling of functions with only kwarg args in getcallargs (closes #11256)
A patch from Daniel Urban.
parent
41a9ec90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
2 deletions
+25
-2
Lib/inspect.py
Lib/inspect.py
+8
-2
Lib/test/test_inspect.py
Lib/test/test_inspect.py
+14
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/inspect.py
View file @
77d46607
...
...
@@ -943,8 +943,14 @@ def getcallargs(func, *positional, **named):
f_name
,
'at most'
if
defaults
else
'exactly'
,
num_args
,
'arguments'
if
num_args
>
1
else
'argument'
,
num_total
))
elif
num_args
==
0
and
num_total
:
raise
TypeError
(
'%s() takes no arguments (%d given)'
%
(
f_name
,
num_total
))
if
varkw
:
if
num_pos
:
# XXX: We should use num_pos, but Python also uses num_total:
raise
TypeError
(
'%s() takes exactly 0 arguments '
'(%d given)'
%
(
f_name
,
num_total
))
else
:
raise
TypeError
(
'%s() takes no arguments (%d given)'
%
(
f_name
,
num_total
))
for
arg
in
args
:
if
isinstance
(
arg
,
str
)
and
arg
in
named
:
if
is_assigned
(
arg
):
...
...
Lib/test/test_inspect.py
View file @
77d46607
...
...
@@ -632,6 +632,16 @@ class TestGetcallargsFunctions(unittest.TestCase):
self
.
assertEqualCallArgs
(
f
,
'2, c=4, **{u"b":3}'
)
self
.
assertEqualCallArgs
(
f
,
'b=2, **{u"a":3, u"c":4}'
)
def
test_varkw_only
(
self
):
# issue11256:
f
=
self
.
makeCallable
(
'**c'
)
self
.
assertEqualCallArgs
(
f
,
''
)
self
.
assertEqualCallArgs
(
f
,
'a=1'
)
self
.
assertEqualCallArgs
(
f
,
'a=1, b=2'
)
self
.
assertEqualCallArgs
(
f
,
'c=3, **{"a": 1, "b": 2}'
)
self
.
assertEqualCallArgs
(
f
,
'**UserDict(a=1, b=2)'
)
self
.
assertEqualCallArgs
(
f
,
'c=3, **UserDict(a=1, b=2)'
)
def
test_tupleargs
(
self
):
f
=
self
.
makeCallable
(
'(b,c), (d,(e,f))=(0,[1,2])'
)
self
.
assertEqualCallArgs
(
f
,
'(2,3)'
)
...
...
@@ -693,6 +703,10 @@ class TestGetcallargsFunctions(unittest.TestCase):
self
.
assertEqualException
(
f
,
'1'
)
self
.
assertEqualException
(
f
,
'[1]'
)
self
.
assertEqualException
(
f
,
'(1,2,3)'
)
# issue11256:
f3
=
self
.
makeCallable
(
'**c'
)
self
.
assertEqualException
(
f3
,
'1, 2'
)
self
.
assertEqualException
(
f3
,
'1, 2, a=1, b=2'
)
class
TestGetcallargsMethods
(
TestGetcallargsFunctions
):
...
...
Misc/NEWS
View file @
77d46607
...
...
@@ -47,6 +47,9 @@ Core and Builtins
Library
-------
- Issue #11256: Fix inspect.getcallargs on functions that take only keyword
arguments.
- Issue #11696: Fix ID generation in msilib.
- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when
...
...
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