mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-14 17:43:53 +00:00
d930de0bca
* Alternative approach to #3807 that supports an important PyCLIF use case: `Base` not specified in `classh<Derived>` statement, but passing Derived as Base works anyway.
* NOtest_multiple_inheritance_getattr in test_class_sh_void_ptr_capsule.py (quick experiment)
* Revert "NOtest_multiple_inheritance_getattr in test_class_sh_void_ptr_capsule.py (quick experiment)"
This reverts commit e8f0749b89
.
* Special handling of pybind11 objects to side-step try_as_void_ptr_capsule_get_pointer __getattr__ issues.
* Inspect `internals.registered_types_py` in `type_is_pybind11_class_()`
* Remove debug code in tests subdir.
* Clean up the modified `try_as_void_ptr_capsule_get_pointer()` implementation and new helper functions.
128 lines
3.9 KiB
C++
128 lines
3.9 KiB
C++
#include <pybind11/smart_holder.h>
|
|
|
|
#include "pybind11_tests.h"
|
|
|
|
#include <memory>
|
|
|
|
namespace pybind11_tests {
|
|
namespace class_sh_void_ptr_capsule {
|
|
|
|
struct Valid {};
|
|
|
|
struct NoConversion {};
|
|
|
|
struct NoCapsuleReturned {};
|
|
|
|
struct AsAnotherObject {};
|
|
|
|
// Create a void pointer capsule for test. The encapsulated object does not
|
|
// matter for this test case.
|
|
PyObject *create_test_void_ptr_capsule() {
|
|
static int just_to_have_something_to_point_to = 0;
|
|
return PyCapsule_New(static_cast<void *>(&just_to_have_something_to_point_to), "int", nullptr);
|
|
}
|
|
|
|
int get_from_valid_capsule(const Valid *) { return 1; }
|
|
|
|
int get_from_shared_ptr_valid_capsule(const std::shared_ptr<Valid> &) { return 2; }
|
|
|
|
int get_from_unique_ptr_valid_capsule(std::unique_ptr<Valid>) { return 3; }
|
|
|
|
int get_from_no_conversion_capsule(const NoConversion *) { return 4; }
|
|
|
|
int get_from_no_capsule_returned(const NoCapsuleReturned *) { return 5; }
|
|
|
|
// https://github.com/pybind/pybind11/issues/3788
|
|
struct TypeWithGetattr {
|
|
TypeWithGetattr() = default;
|
|
int get_42() const { return 42; }
|
|
};
|
|
|
|
// https://github.com/pybind/pybind11/issues/3804
|
|
struct Base1 {
|
|
int a1{};
|
|
};
|
|
struct Base2 {
|
|
int a2{};
|
|
};
|
|
|
|
struct Base12 : Base1, Base2 {
|
|
int foo() const { return 0; }
|
|
};
|
|
|
|
struct Derived1 : Base12 {
|
|
int bar() const { return 1; }
|
|
};
|
|
|
|
struct Derived2 : Base12 {
|
|
int bar() const { return 2; }
|
|
};
|
|
|
|
struct UnspecBase {
|
|
virtual ~UnspecBase() = default;
|
|
virtual int Get() const { return 100; }
|
|
};
|
|
|
|
int PassUnspecBase(const UnspecBase &sb) { return sb.Get() + 30; }
|
|
|
|
struct UnspecDerived : UnspecBase {
|
|
int Get() const override { return 200; }
|
|
};
|
|
|
|
} // namespace class_sh_void_ptr_capsule
|
|
} // namespace pybind11_tests
|
|
|
|
using namespace pybind11_tests::class_sh_void_ptr_capsule;
|
|
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Valid)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(TypeWithGetattr)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Base1)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Base2)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Base12)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Derived1)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Derived2)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(UnspecBase)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(UnspecDerived)
|
|
|
|
TEST_SUBMODULE(class_sh_void_ptr_capsule, m) {
|
|
py::classh<Valid>(m, "Valid");
|
|
|
|
m.def("get_from_valid_capsule", &get_from_valid_capsule);
|
|
m.def("get_from_shared_ptr_valid_capsule", &get_from_shared_ptr_valid_capsule);
|
|
m.def("get_from_unique_ptr_valid_capsule", &get_from_unique_ptr_valid_capsule);
|
|
m.def("get_from_no_conversion_capsule", &get_from_no_conversion_capsule);
|
|
m.def("get_from_no_capsule_returned", &get_from_no_capsule_returned);
|
|
m.def("create_test_void_ptr_capsule", []() {
|
|
PyObject *capsule = create_test_void_ptr_capsule();
|
|
return pybind11::reinterpret_steal<py::capsule>(capsule);
|
|
});
|
|
|
|
py::classh<TypeWithGetattr>(m, "TypeWithGetattr")
|
|
.def(py::init<>())
|
|
.def("get_42", &TypeWithGetattr::get_42)
|
|
.def("__getattr__",
|
|
[](TypeWithGetattr &, const std::string &key) { return "GetAttr: " + key; });
|
|
|
|
py::classh<Base1>(m, "Base1");
|
|
py::classh<Base2>(m, "Base2");
|
|
|
|
py::classh<Base12, Base1, Base2>(m, "Base12")
|
|
.def(py::init<>())
|
|
.def("foo", &Base12::foo)
|
|
.def("__getattr__",
|
|
[](Base12 &, const std::string &key) { return "Base GetAttr: " + key; });
|
|
|
|
py::classh<Derived1, Base12>(m, "Derived1").def(py::init<>()).def("bar", &Derived1::bar);
|
|
|
|
py::classh<Derived2, Base12>(m, "Derived2").def(py::init<>()).def("bar", &Derived2::bar);
|
|
|
|
py::classh<UnspecBase>(m, "UnspecBase");
|
|
m.def("PassUnspecBase", PassUnspecBase);
|
|
py::classh<UnspecDerived>(m, "UnspecDerived") // UnspecBase NOT specified as base here.
|
|
.def(py::init<>())
|
|
.def("as_pybind11_tests_class_sh_void_ptr_capsule_UnspecBase", [](UnspecDerived *self) {
|
|
return py::reinterpret_steal<py::object>(
|
|
PyCapsule_New(static_cast<void *>(self), nullptr, nullptr));
|
|
});
|
|
}
|