mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-29 16:37:13 +00:00
Merge branch 'master' into smart_holder
This commit is contained in:
commit
c2111fd353
@ -363,7 +363,13 @@ template <typename Class, typename T, typename O,
|
|||||||
enable_if_t<std::is_convertible<O, handle>::value, int> = 0>
|
enable_if_t<std::is_convertible<O, handle>::value, int> = 0>
|
||||||
void setstate(value_and_holder &v_h, std::pair<T, O> &&result, bool need_alias) {
|
void setstate(value_and_holder &v_h, std::pair<T, O> &&result, bool need_alias) {
|
||||||
construct<Class>(v_h, std::move(result.first), need_alias);
|
construct<Class>(v_h, std::move(result.first), need_alias);
|
||||||
setattr((PyObject *) v_h.inst, "__dict__", result.second);
|
auto d = handle(result.second);
|
||||||
|
if (PyDict_Check(d.ptr()) && PyDict_Size(d.ptr()) == 0) {
|
||||||
|
// Skipping setattr below, to not force use of py::dynamic_attr() for Class unnecessarily.
|
||||||
|
// See PR #2972 for details.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setattr((PyObject *) v_h.inst, "__dict__", d);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Implementation for py::pickle(GetState, SetState)
|
/// Implementation for py::pickle(GetState, SetState)
|
||||||
|
@ -444,6 +444,17 @@ def test_casts_none(msg):
|
|||||||
assert m.ok_obj_or_none(None) == -1
|
assert m.ok_obj_or_none(None) == -1
|
||||||
|
|
||||||
|
|
||||||
|
def test_casts_none(msg):
|
||||||
|
"""#2778: implicit casting from None to object (not pointer)"""
|
||||||
|
a = m.NoneCastTester()
|
||||||
|
assert m.ok_obj_or_none(a) == -1
|
||||||
|
a = m.NoneCastTester(4)
|
||||||
|
assert m.ok_obj_or_none(a) == 4
|
||||||
|
a = m.NoneCastTester(None)
|
||||||
|
assert m.ok_obj_or_none(a) == -1
|
||||||
|
assert m.ok_obj_or_none(None) == -1
|
||||||
|
|
||||||
|
|
||||||
def test_str_issue(msg):
|
def test_str_issue(msg):
|
||||||
"""#283: __str__ called on uninitialized instance when constructor arguments invalid"""
|
"""#283: __str__ called on uninitialized instance when constructor arguments invalid"""
|
||||||
|
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
|
// clang-format off
|
||||||
/*
|
/*
|
||||||
tests/test_pickling.cpp -- pickle support
|
tests/test_pickling.cpp -- pickle support
|
||||||
|
|
||||||
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
||||||
|
Copyright (c) 2021 The Pybind Development Team.
|
||||||
|
|
||||||
All rights reserved. Use of this source code is governed by a
|
All rights reserved. Use of this source code is governed by a
|
||||||
BSD-style license that can be found in the LICENSE file.
|
BSD-style license that can be found in the LICENSE file.
|
||||||
@ -9,6 +11,58 @@
|
|||||||
|
|
||||||
#include "pybind11_tests.h"
|
#include "pybind11_tests.h"
|
||||||
|
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
namespace exercise_trampoline {
|
||||||
|
|
||||||
|
struct SimpleBase {
|
||||||
|
int num = 0;
|
||||||
|
virtual ~SimpleBase() = default;
|
||||||
|
|
||||||
|
// For compatibility with old clang versions:
|
||||||
|
SimpleBase() = default;
|
||||||
|
SimpleBase(const SimpleBase &) = default;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct SimpleBaseTrampoline : SimpleBase {};
|
||||||
|
|
||||||
|
struct SimpleCppDerived : SimpleBase {};
|
||||||
|
|
||||||
|
void wrap(py::module m) {
|
||||||
|
py::class_<SimpleBase, SimpleBaseTrampoline>(m, "SimpleBase")
|
||||||
|
.def(py::init<>())
|
||||||
|
.def_readwrite("num", &SimpleBase::num)
|
||||||
|
.def(py::pickle(
|
||||||
|
[](const py::object &self) {
|
||||||
|
py::dict d;
|
||||||
|
if (py::hasattr(self, "__dict__"))
|
||||||
|
d = self.attr("__dict__");
|
||||||
|
return py::make_tuple(self.attr("num"), d);
|
||||||
|
},
|
||||||
|
[](const py::tuple &t) {
|
||||||
|
if (t.size() != 2)
|
||||||
|
throw std::runtime_error("Invalid state!");
|
||||||
|
auto cpp_state = std::unique_ptr<SimpleBase>(new SimpleBaseTrampoline);
|
||||||
|
cpp_state->num = t[0].cast<int>();
|
||||||
|
auto py_state = t[1].cast<py::dict>();
|
||||||
|
return std::make_pair(std::move(cpp_state), py_state);
|
||||||
|
}));
|
||||||
|
|
||||||
|
m.def("make_SimpleCppDerivedAsBase",
|
||||||
|
[]() { return std::unique_ptr<SimpleBase>(new SimpleCppDerived); });
|
||||||
|
m.def("check_dynamic_cast_SimpleCppDerived", [](const SimpleBase *base_ptr) {
|
||||||
|
return dynamic_cast<const SimpleCppDerived *>(base_ptr) != nullptr;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace exercise_trampoline
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
|
|
||||||
TEST_SUBMODULE(pickling, m) {
|
TEST_SUBMODULE(pickling, m) {
|
||||||
// test_roundtrip
|
// test_roundtrip
|
||||||
class Pickleable {
|
class Pickleable {
|
||||||
@ -130,4 +184,6 @@ TEST_SUBMODULE(pickling, m) {
|
|||||||
return std::make_pair(cpp_state, py_state);
|
return std::make_pair(cpp_state, py_state);
|
||||||
}));
|
}));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
exercise_trampoline::wrap(m);
|
||||||
}
|
}
|
||||||
|
@ -45,3 +45,39 @@ def test_enum_pickle():
|
|||||||
|
|
||||||
data = pickle.dumps(e.EOne, 2)
|
data = pickle.dumps(e.EOne, 2)
|
||||||
assert e.EOne == pickle.loads(data)
|
assert e.EOne == pickle.loads(data)
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# exercise_trampoline
|
||||||
|
#
|
||||||
|
class SimplePyDerived(m.SimpleBase):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def test_roundtrip_simple_py_derived():
|
||||||
|
p = SimplePyDerived()
|
||||||
|
p.num = 202
|
||||||
|
p.stored_in_dict = 303
|
||||||
|
data = pickle.dumps(p, pickle.HIGHEST_PROTOCOL)
|
||||||
|
p2 = pickle.loads(data)
|
||||||
|
assert isinstance(p2, SimplePyDerived)
|
||||||
|
assert p2.num == 202
|
||||||
|
assert p2.stored_in_dict == 303
|
||||||
|
|
||||||
|
|
||||||
|
def test_roundtrip_simple_cpp_derived():
|
||||||
|
p = m.make_SimpleCppDerivedAsBase()
|
||||||
|
assert m.check_dynamic_cast_SimpleCppDerived(p)
|
||||||
|
p.num = 404
|
||||||
|
if not env.PYPY:
|
||||||
|
# To ensure that this unit test is not accidentally invalidated.
|
||||||
|
with pytest.raises(AttributeError):
|
||||||
|
# Mimics the `setstate` C++ implementation.
|
||||||
|
setattr(p, "__dict__", {}) # noqa: B010
|
||||||
|
data = pickle.dumps(p, pickle.HIGHEST_PROTOCOL)
|
||||||
|
p2 = pickle.loads(data)
|
||||||
|
assert isinstance(p2, m.SimpleBase)
|
||||||
|
assert p2.num == 404
|
||||||
|
# Issue #3062: pickleable base C++ classes can incur object slicing
|
||||||
|
# if derived typeid is not registered with pybind11
|
||||||
|
assert not m.check_dynamic_cast_SimpleCppDerived(p2)
|
||||||
|
Loading…
Reference in New Issue
Block a user