RYDE-WORK/pybind11
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/pybind11.git synced 2026-02-07 16:13:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make bad kwarg arguments try next overload

Browse Source 
Fixes #688.

My (commented) assumption that such an error is "highly likely to be a
caller mistake" was proven false by #688.
This commit is contained in:
Jason Rhinelander 2017-02-23 19:54:53 -05:00 committed by Wenzel Jakob
parent 60d0e0db3e
commit caa1379e92
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/pybind11/pybind11.h
View File

@ -444,21 +444,19 @@ protected:
size_t args_copied = 0; size_t args_copied = 0;
// 1. Copy any position arguments given. // 1. Copy any position arguments given.
bool bad_kwarg = false;
for (; args_copied < args_to_copy; ++args_copied) { for (; args_copied < args_to_copy; ++args_copied) {
// If we find a given positional argument that also has a named kwargs argument, if (kwargs_in && args_copied < func.args.size() && func.args[args_copied].name
// raise a TypeError like Python does. (We could also continue with the next && PyDict_GetItemString(kwargs_in, func.args[args_copied].name)) {
// overload, but this seems highly likely to be a caller mistake rather than a bad_kwarg = true;
// legitimate overload). break;
if (kwargs_in && args_copied < func.args.size() && func.args[args_copied].name) {
handle value = PyDict_GetItemString(kwargs_in, func.args[args_copied].name);
if (value)
throw type_error(std::string(func.name) + "(): got multiple values for argument '" +
std::string(func.args[args_copied].name) + "'");
} }
call.args.push_back(PyTuple_GET_ITEM(args_in, args_copied)); call.args.push_back(PyTuple_GET_ITEM(args_in, args_copied));
call.args_convert.push_back(args_copied < func.args.size() ? func.args[args_copied].convert : true); call.args_convert.push_back(args_copied < func.args.size() ? func.args[args_copied].convert : true);
} }
if (bad_kwarg)
continue; // Maybe it was meant for another overload (issue #688)
// We'll need to copy this if we steal some kwargs for defaults // We'll need to copy this if we steal some kwargs for defaults
dict kwargs = reinterpret_borrow<dict>(kwargs_in); dict kwargs = reinterpret_borrow<dict>(kwargs_in);