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

fix: also throw in the move-constructor added by the PYBIND11_OBJECT macro, after the argument has been moved-out (if necessary) (#2701)

Browse Source
This commit is contained in:
Yannick Jadoul 2020-12-16 05:22:53 +01:00 committed by GitHub
parent d9fa70561e
commit 30eb39ed79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/pybind11/pytypes.h
View File

@ -812,18 +812,18 @@ PYBIND11_NAMESPACE_END(detail)
: Parent(check_(o) ? o.release().ptr() : ConvertFun(o.ptr()), stolen_t{}) \ : Parent(check_(o) ? o.release().ptr() : ConvertFun(o.ptr()), stolen_t{}) \
{ if (!m_ptr) throw error_already_set(); } { if (!m_ptr) throw error_already_set(); }
#define PYBIND11_OBJECT_CHECK_FAILED(Name, o) \ #define PYBIND11_OBJECT_CHECK_FAILED(Name, o_ptr) \
::pybind11::type_error("Object of type '" + \ ::pybind11::type_error("Object of type '" + \
::pybind11::detail::get_fully_qualified_tp_name(Py_TYPE(o.ptr())) + \ ::pybind11::detail::get_fully_qualified_tp_name(Py_TYPE(o_ptr)) + \
"' is not an instance of '" #Name "'") "' is not an instance of '" #Name "'")
#define PYBIND11_OBJECT(Name, Parent, CheckFun) \ #define PYBIND11_OBJECT(Name, Parent, CheckFun) \
PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun) \ PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun) \
/* This is deliberately not 'explicit' to allow implicit conversion from object: */ \ /* This is deliberately not 'explicit' to allow implicit conversion from object: */ \
Name(const object &o) : Parent(o) \ Name(const object &o) : Parent(o) \
{ if (o && !check_(o)) throw PYBIND11_OBJECT_CHECK_FAILED(Name, o); } \ { if (m_ptr && !check_(m_ptr)) throw PYBIND11_OBJECT_CHECK_FAILED(Name, m_ptr); } \
Name(object &&o) : Parent(std::move(o)) \ Name(object &&o) : Parent(std::move(o)) \
{ if (o && !check_(o)) throw PYBIND11_OBJECT_CHECK_FAILED(Name, o); } { if (m_ptr && !check_(m_ptr)) throw PYBIND11_OBJECT_CHECK_FAILED(Name, m_ptr); }
#define PYBIND11_OBJECT_DEFAULT(Name, Parent, CheckFun) \ #define PYBIND11_OBJECT_DEFAULT(Name, Parent, CheckFun) \
PYBIND11_OBJECT(Name, Parent, CheckFun) \ PYBIND11_OBJECT(Name, Parent, CheckFun) \

11
tests/test_pytypes.cpp
View File

@ -254,15 +254,18 @@ TEST_SUBMODULE(pytypes, m) {
m.def("convert_to_pybind11_str", [](py::object o) { return py::str(o); }); m.def("convert_to_pybind11_str", [](py::object o) { return py::str(o); });
m.def("nonconverting_constructor", [](std::string type, py::object value) -> py::object { m.def("nonconverting_constructor", [](std::string type, py::object value, bool move) -> py::object {
if (type == "bytes") { if (type == "bytes") {
return py::bytes(value); return move ? py::bytes(std::move(value)) : py::bytes(value);
} }
else if (type == "none") { else if (type == "none") {
return py::none(value); return move ? py::none(std::move(value)) : py::none(value);
} }
else if (type == "ellipsis") { else if (type == "ellipsis") {
return py::ellipsis(value); return move ? py::ellipsis(std::move(value)) : py::ellipsis(value);
}
else if (type == "type") {
return move ? py::type(std::move(value)) : py::type(value);
} }
throw std::runtime_error("Invalid type"); throw std::runtime_error("Invalid type");
}); });

14
tests/test_pytypes.py
View File

@ -268,14 +268,16 @@ def test_non_converting_constructors():
("bytes", range(10)), ("bytes", range(10)),
("none", 42), ("none", 42),
("ellipsis", 42), ("ellipsis", 42),
("type", 42),
] ]
for t, v in non_converting_test_cases: for t, v in non_converting_test_cases:
with pytest.raises(TypeError) as excinfo: for move in [True, False]:
m.nonconverting_constructor(t, v) with pytest.raises(TypeError) as excinfo:
expected_error = "Object of type '{}' is not an instance of '{}'".format( m.nonconverting_constructor(t, v, move)
type(v).__name__, t expected_error = "Object of type '{}' is not an instance of '{}'".format(
) type(v).__name__, t
assert str(excinfo.value) == expected_error )
assert str(excinfo.value) == expected_error
def test_pybind11_str_raw_str(): def test_pybind11_str_raw_str():