merge 3.3 (closes #20108)

This commit is contained in:
Benjamin Peterson 2014-01-02 12:26:50 -06:00
commit c22eaecd53
3 changed files with 6 additions and 2 deletions

View file

@ -753,7 +753,7 @@ Classes and functions
metatype is in use, cls will be the first element of the tuple.
.. function:: getcallargs(func[, *args][, **kwds])
.. function:: getcallargs(func, *args, **kwds)
Bind the *args* and *kwds* to the argument names of the Python function or
method *func*, as if it was called with them. For bound methods, bind also the