mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-22 13:15:12 +00:00
Enable defining custom __new__ (#3265)
* Enable defining custom __new__ * See if xfail needed * Qualify auto self * Unconditionally defining PYBIND11_DISABLE_NEW_STYLE_INIT_WARNING. Returning pointer from "__init__" instead of reference. * Use new style __init__ * Simplify __new__ creation * Reviewer suggestions * Match indentation Co-authored-by: Ralf W. Grosse-Kunstleve <rwgk@google.com>
This commit is contained in:
parent
14976c853b
commit
d0f3c51f01
@ -416,7 +416,8 @@ protected:
|
|||||||
detail::function_record *chain = nullptr, *chain_start = rec;
|
detail::function_record *chain = nullptr, *chain_start = rec;
|
||||||
if (rec->sibling) {
|
if (rec->sibling) {
|
||||||
if (PyCFunction_Check(rec->sibling.ptr())) {
|
if (PyCFunction_Check(rec->sibling.ptr())) {
|
||||||
auto rec_capsule = reinterpret_borrow<capsule>(PyCFunction_GET_SELF(rec->sibling.ptr()));
|
auto *self = PyCFunction_GET_SELF(rec->sibling.ptr());
|
||||||
|
capsule rec_capsule = isinstance<capsule>(self) ? reinterpret_borrow<capsule>(self) : capsule(self);
|
||||||
chain = (detail::function_record *) rec_capsule;
|
chain = (detail::function_record *) rec_capsule;
|
||||||
/* Never append a method to an overload chain of a parent class;
|
/* Never append a method to an overload chain of a parent class;
|
||||||
instead, hide the parent's overloads in this case */
|
instead, hide the parent's overloads in this case */
|
||||||
|
@ -47,10 +47,25 @@ TEST_SUBMODULE(class_, m) {
|
|||||||
}
|
}
|
||||||
~NoConstructor() { print_destroyed(this); }
|
~NoConstructor() { print_destroyed(this); }
|
||||||
};
|
};
|
||||||
|
struct NoConstructorNew {
|
||||||
|
NoConstructorNew() = default;
|
||||||
|
NoConstructorNew(const NoConstructorNew &) = default;
|
||||||
|
NoConstructorNew(NoConstructorNew &&) = default;
|
||||||
|
static NoConstructorNew *new_instance() {
|
||||||
|
auto *ptr = new NoConstructorNew();
|
||||||
|
print_created(ptr, "via new_instance");
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
~NoConstructorNew() { print_destroyed(this); }
|
||||||
|
};
|
||||||
|
|
||||||
py::class_<NoConstructor>(m, "NoConstructor")
|
py::class_<NoConstructor>(m, "NoConstructor")
|
||||||
.def_static("new_instance", &NoConstructor::new_instance, "Return an instance");
|
.def_static("new_instance", &NoConstructor::new_instance, "Return an instance");
|
||||||
|
|
||||||
|
py::class_<NoConstructorNew>(m, "NoConstructorNew")
|
||||||
|
.def(py::init([](NoConstructorNew *self) { return self; })) // Need a NOOP __init__
|
||||||
|
.def_static("__new__", [](const py::object *) { return NoConstructorNew::new_instance(); } );
|
||||||
|
|
||||||
// test_inheritance
|
// test_inheritance
|
||||||
class Pet {
|
class Pet {
|
||||||
public:
|
public:
|
||||||
|
@ -25,6 +25,14 @@ def test_instance(msg):
|
|||||||
assert cstats.alive() == 0
|
assert cstats.alive() == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_instance_new(msg):
|
||||||
|
instance = m.NoConstructorNew() # .__new__(m.NoConstructor.__class__)
|
||||||
|
cstats = ConstructorStats.get(m.NoConstructorNew)
|
||||||
|
assert cstats.alive() == 1
|
||||||
|
del instance
|
||||||
|
assert cstats.alive() == 0
|
||||||
|
|
||||||
|
|
||||||
def test_type():
|
def test_type():
|
||||||
assert m.check_type(1) == m.DerivedClass1
|
assert m.check_type(1) == m.DerivedClass1
|
||||||
with pytest.raises(RuntimeError) as execinfo:
|
with pytest.raises(RuntimeError) as execinfo:
|
||||||
|
Loading…
Reference in New Issue
Block a user