Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-25 06:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid attr("__repr__") in initialize_generic (#2317)

Browse Source 
If the default argument value is a class, and not an instance of a
class, `a.value.attr("__repr__")` raises a `ValueError`. Switching to
`repr(a.value)` makes this use case work.

Fixes #2028
This commit is contained in:
Boris Staletic 2020-07-24 18:43:59 +02:00 committed by GitHub
parent 6f3e5e38c9
commit 2819ce64a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pybind11/pybind11.h
View File

@ -228,7 +228,7 @@ protected:
if (a.descr) if (a.descr)
a.descr = strdup(a.descr); a.descr = strdup(a.descr);
else if (a.value) else if (a.value)
a.descr = strdup(a.value.attr("__repr__")().cast<std::string>().c_str()); a.descr = strdup(repr(a.value).cast<std::string>().c_str());
} }
rec->is_constructor = !strcmp(rec->name, "__init__") || !strcmp(rec->name, "__setstate__"); rec->is_constructor = !strcmp(rec->name, "__init__") || !strcmp(rec->name, "__setstate__");

5
tests/test_kwargs_and_defaults.cpp
View File

@ -123,4 +123,9 @@ TEST_SUBMODULE(kwargs_and_defaults, m) {
py::class_<KWClass>(m, "KWClass") py::class_<KWClass>(m, "KWClass")
.def("foo0", &KWClass::foo) .def("foo0", &KWClass::foo)
.def("foo1", &KWClass::foo, "x"_a, "y"_a); .def("foo1", &KWClass::foo, "x"_a, "y"_a);
// Make sure a class (not an instance) can be used as a default argument.
// The return value doesn't matter, only that the module is importable.
m.def("class_default_argument", [](py::object a) { return py::repr(a); },
"a"_a = py::module::import("decimal").attr("Decimal"));
} }

2
tests/test_kwargs_and_defaults.py
View File

@ -191,3 +191,5 @@ def test_args_refcount():
# tuple without having to inc_ref the individual elements, but here we can't, hence the extra # tuple without having to inc_ref the individual elements, but here we can't, hence the extra
# refs. # refs.
assert m.mixed_args_refcount(myval, myval, myval) == (exp3 + 3, exp3 + 3, exp3 + 3) assert m.mixed_args_refcount(myval, myval, myval) == (exp3 + 3, exp3 + 3, exp3 + 3)
assert m.class_default_argument() == "<class 'decimal.Decimal'>"