mirror of
https://github.com/pybind/pybind11.git
synced 2026-03-14 20:27:47 +00:00
* Pure `git merge --squash smart_holder` (no manual interventions). * Remove ubench/ directory. * Remove include/pybind11/smart_holder.h * [ci skip] smart_ptrs.rst updates [WIP/unfinished] * [ci skip] smart_ptrs.rst updates continued; also updating classes.rst, advanced/classes.rst * Remove README_smart_holder.rst * Restore original README.rst from master * [ci skip] Minimal change to README.rst, to leave a hint that this is pybind11v3 * [ci skip] Work in ChatGPT suggestions. * Change macro name to PYBIND11_RUN_TESTING_WITH_SMART_HOLDER_AS_DEFAULT_BUT_NEVER_USE_IN_PRODUCTION_PLEASE * Add a note pointing to the holder reinterpret_cast. * Incorporate suggestion by @virtuald: https://github.com/pybind/pybind11/pull/5542#discussion_r1967000989 * Systematically change most py::class_ to py::classh under docs/ * Remove references to README_smart_holder.rst This should have been part of commiteb550d03d3. * [ci skip] Fix minor oversight (``class_`` -> ``py::class_``) noticed by chance. * [ci skip] Resolve suggestion by @virtuald https://github.com/pybind/pybind11/pull/5542#discussion_r1969940605 * [ci skip] Apply suggestions by @timohl (thanks!) * https://github.com/pybind/pybind11/pull/5542#discussion_r1970714551 * https://github.com/pybind/pybind11/pull/5542#discussion_r1971315329 * https://github.com/pybind/pybind11/pull/5542#discussion_r1971322821 * Replace `classh : class_` inhertance with `using`, as suggested by @henryiii https://github.com/pybind/pybind11/pull/5542#issuecomment-2689034104 * Revert "Systematically change most py::class_ to py::classh under docs/" This reverts commitac9d31e13f. * docs: focus on py::smart_holder instead of py::classh Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * Restore minor general fixes that got lost whenac9d31e13fwas reverted. * Remove `- smart_holder` from list of branches in all .github/workflows * Extend classh note to explain whitespace noise motivation. * Suggest `py::smart_holder` for "most situations for safety" * Add back PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT This define was * introduced with https://github.com/pybind/pybind11/pull/5286 * removed with https://github.com/pybind/pybind11/pull/5531 It is has been in use here: *f02a2b7653/pybind11_protobuf/native_proto_caster.h (L89-L101)Currently pybind11 unit tests for the two holder caster backwards compatibility traits * `copyable_holder_caster_shared_ptr_with_smart_holder_support_enabled` * `move_only_holder_caster_unique_ptr_with_smart_holder_support_enabled` are missing. * Add py::trampoline_self_life_support to all trampoline examples under docs/. Address suggestion by @timohl: * https://github.com/pybind/pybind11/pull/5542#issuecomment-2686452062 Add to the "please think twice" note: the overhead for safety is likely in the noise. Also fix a two-fold inconsistency introduced by revert-commit1e646c91b4: 1. py::trampoline_self_life_support is mentioned in a note, but is missing in the example right before. 2. The section starting with To enable safely passing a ``std::unique_ptr`` to a trampoline object between is obsolete. * Fix whitespace accident (indentation) introduced with1e646c91b4Apparently the mis-indentation was introduced when resolving merge conflicts for what became1e646c91b4* WHITESPACE CHANGES ONLY in README.rst (list of people that made significant contributions) * Add Ethan Steinberg to list of people that made significant contributions (for completeness, unrelated to smart_holder work). * [ci skip] Add to list of people that made significant contributions: major and/or influential contributors to smart_holder branch * #2904 by @rhaschke was merged on Mar 16, 2021 * #3012 by @rhaschke was merged on May 28, 2021 * #3039 by @jakobandersen was merged on Jun 29, 2021 * #3048 by @Skylion007 was merged on Jun 18, 2021 * #3588 by @virtuald was merged on Jan 3, 2022 * #3633 by @wangxf123456 was merged on Jan 25, 2022 * #3635 by @virtuald was merged on Jan 26, 2022 * #3645 by @wangxf123456 was merged on Jan 25, 2022 * #3796 by @wangxf123456 was merged on Mar 10, 2022 * #3807 by @wangxf123456 was merged on Mar 18, 2022 * #3838 by @wangxf123456 was merged on Apr 15, 2022 * #3929 by @tomba was merged on May 7, 2022 * #4031 by @wangxf123456 was merged on Jun 27, 2022 * #4343 by @wangxf123456 was merged on Nov 18, 2022 * #4381 by @wangxf123456 was merged on Dec 5, 2022 * #4539 by @wangxf123456 was merged on Feb 28, 2023 * #4609 by @wangxf123456 was merged on Apr 6, 2023 * #4775 by @wangxf123456 was merged on Aug 3, 2023 * #4921 by @iwanders was merged on Nov 7, 2023 * #4924 by @iwanders was merged on Nov 6, 2023 * #5401 by @msimacek was merged on Oct 8, 2024 Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Dustin Spicuzza <dustin@virtualroadside.com> Co-authored-by: Ivor Wanders <iwanders@users.noreply.github.com> Co-authored-by: Jakob Lykke Andersen <Jakob@caput.dk> Co-authored-by: Michael Šimáček <michael.simacek@oracle.com> Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com> Co-authored-by: Tomi Valkeinen <tomi.valkeinen@iki.fi> Co-authored-by: Xiaofei Wang <6218006+wangxf123456@users.noreply.github.com> --------- Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Dustin Spicuzza <dustin@virtualroadside.com> Co-authored-by: Ivor Wanders <iwanders@users.noreply.github.com> Co-authored-by: Jakob Lykke Andersen <Jakob@caput.dk> Co-authored-by: Michael Šimáček <michael.simacek@oracle.com> Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com> Co-authored-by: Tomi Valkeinen <tomi.valkeinen@iki.fi> Co-authored-by: Xiaofei Wang <6218006+wangxf123456@users.noreply.github.com>
167 lines
5.9 KiB
Python
167 lines
5.9 KiB
Python
# The compact 4-character naming scheme (e.g. mptr, cptr, shcp) is explained at the top of
|
|
# test_class_sh_property.cpp.
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
import env # noqa: F401
|
|
from pybind11_tests import class_sh_property as m
|
|
|
|
|
|
@pytest.mark.skipif(
|
|
"env.PYPY or env.GRAALPY", reason="gc after `del field` is apparently deferred"
|
|
)
|
|
@pytest.mark.parametrize("m_attr", ["m_valu_readonly", "m_valu_readwrite"])
|
|
def test_valu_getter(m_attr):
|
|
# Reduced from PyCLIF test:
|
|
# https://github.com/google/clif/blob/c371a6d4b28d25d53a16e6d2a6d97305fb1be25a/clif/testing/python/nested_fields_test.py#L56
|
|
outer = m.Outer()
|
|
field = getattr(outer, m_attr)
|
|
assert field.num == -99
|
|
with pytest.raises(ValueError) as excinfo:
|
|
m.DisownOuter(outer)
|
|
assert str(excinfo.value) == "Cannot disown use_count != 1 (load_as_unique_ptr)."
|
|
del field
|
|
m.DisownOuter(outer)
|
|
with pytest.raises(ValueError, match="Python instance was disowned") as excinfo:
|
|
getattr(outer, m_attr)
|
|
|
|
|
|
def test_valu_setter():
|
|
outer = m.Outer()
|
|
assert outer.m_valu_readonly.num == -99
|
|
assert outer.m_valu_readwrite.num == -99
|
|
field = m.Field()
|
|
field.num = 35
|
|
outer.m_valu_readwrite = field
|
|
assert outer.m_valu_readonly.num == 35
|
|
assert outer.m_valu_readwrite.num == 35
|
|
|
|
|
|
@pytest.mark.parametrize("m_attr", ["m_shmp", "m_shcp"])
|
|
def test_shp(m_attr):
|
|
m_attr_readonly = m_attr + "_readonly"
|
|
m_attr_readwrite = m_attr + "_readwrite"
|
|
outer = m.Outer()
|
|
assert getattr(outer, m_attr_readonly) is None
|
|
assert getattr(outer, m_attr_readwrite) is None
|
|
field = m.Field()
|
|
field.num = 43
|
|
setattr(outer, m_attr_readwrite, field)
|
|
assert getattr(outer, m_attr_readonly).num == 43
|
|
assert getattr(outer, m_attr_readwrite).num == 43
|
|
getattr(outer, m_attr_readonly).num = 57
|
|
getattr(outer, m_attr_readwrite).num = 57
|
|
assert field.num == 57
|
|
del field
|
|
assert getattr(outer, m_attr_readonly).num == 57
|
|
assert getattr(outer, m_attr_readwrite).num == 57
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("field_type", "num_default", "outer_type"),
|
|
[
|
|
(m.ClassicField, -88, m.ClassicOuter),
|
|
(m.Field, -99, m.Outer),
|
|
],
|
|
)
|
|
@pytest.mark.parametrize("m_attr", ["m_mptr", "m_cptr"])
|
|
@pytest.mark.parametrize("r_kind", ["_readonly", "_readwrite"])
|
|
def test_ptr(field_type, num_default, outer_type, m_attr, r_kind):
|
|
m_attr_r_kind = m_attr + r_kind
|
|
outer = outer_type()
|
|
assert getattr(outer, m_attr_r_kind) is None
|
|
field = field_type()
|
|
assert field.num == num_default
|
|
setattr(outer, m_attr + "_readwrite", field)
|
|
assert getattr(outer, m_attr_r_kind).num == num_default
|
|
field.num = 76
|
|
assert getattr(outer, m_attr_r_kind).num == 76
|
|
# Change to -88 or -99 to demonstrate Undefined Behavior (dangling pointer).
|
|
if num_default == 88 and m_attr == "m_mptr":
|
|
del field
|
|
assert getattr(outer, m_attr_r_kind).num == 76
|
|
|
|
|
|
@pytest.mark.parametrize("m_attr_readwrite", ["m_uqmp_readwrite", "m_uqcp_readwrite"])
|
|
def test_uqp(m_attr_readwrite):
|
|
outer = m.Outer()
|
|
assert getattr(outer, m_attr_readwrite) is None
|
|
field_orig = m.Field()
|
|
field_orig.num = 39
|
|
setattr(outer, m_attr_readwrite, field_orig)
|
|
with pytest.raises(ValueError, match="Python instance was disowned"):
|
|
_ = field_orig.num
|
|
field_retr1 = getattr(outer, m_attr_readwrite)
|
|
assert getattr(outer, m_attr_readwrite) is None
|
|
assert field_retr1.num == 39
|
|
field_retr1.num = 93
|
|
setattr(outer, m_attr_readwrite, field_retr1)
|
|
with pytest.raises(ValueError):
|
|
_ = field_retr1.num
|
|
field_retr2 = getattr(outer, m_attr_readwrite)
|
|
assert field_retr2.num == 93
|
|
|
|
|
|
# Proof-of-concept (POC) for safe & intuitive Python access to unique_ptr members.
|
|
# The C++ member unique_ptr is disowned to a temporary Python object for accessing
|
|
# an attribute of the member. After the attribute was accessed, the Python object
|
|
# is disowned back to the C++ member unique_ptr.
|
|
# Productizing this POC is left for a future separate PR, as needed.
|
|
class unique_ptr_field_proxy_poc:
|
|
def __init__(self, obj, field_name):
|
|
object.__setattr__(self, "__obj", obj)
|
|
object.__setattr__(self, "__field_name", field_name)
|
|
|
|
def __getattr__(self, *args, **kwargs):
|
|
return _proxy_dereference(self, getattr, *args, **kwargs)
|
|
|
|
def __setattr__(self, *args, **kwargs):
|
|
return _proxy_dereference(self, setattr, *args, **kwargs)
|
|
|
|
def __delattr__(self, *args, **kwargs):
|
|
return _proxy_dereference(self, delattr, *args, **kwargs)
|
|
|
|
|
|
def _proxy_dereference(proxy, xxxattr, *args, **kwargs):
|
|
obj = object.__getattribute__(proxy, "__obj")
|
|
field_name = object.__getattribute__(proxy, "__field_name")
|
|
field = getattr(obj, field_name) # Disowns the C++ unique_ptr member.
|
|
assert field is not None
|
|
try:
|
|
return xxxattr(field, *args, **kwargs)
|
|
finally:
|
|
setattr(obj, field_name, field) # Disowns the temporary Python object (field).
|
|
|
|
|
|
@pytest.mark.parametrize("m_attr", ["m_uqmp", "m_uqcp"])
|
|
def test_unique_ptr_field_proxy_poc(m_attr):
|
|
m_attr_readwrite = m_attr + "_readwrite"
|
|
outer = m.Outer()
|
|
field_orig = m.Field()
|
|
field_orig.num = 45
|
|
setattr(outer, m_attr_readwrite, field_orig)
|
|
field_proxy = unique_ptr_field_proxy_poc(outer, m_attr_readwrite)
|
|
assert field_proxy.num == 45
|
|
assert field_proxy.num == 45
|
|
with pytest.raises(AttributeError):
|
|
_ = field_proxy.xyz
|
|
assert field_proxy.num == 45
|
|
field_proxy.num = 82
|
|
assert field_proxy.num == 82
|
|
field_proxy = unique_ptr_field_proxy_poc(outer, m_attr_readwrite)
|
|
assert field_proxy.num == 82
|
|
with pytest.raises(AttributeError):
|
|
del field_proxy.num
|
|
assert field_proxy.num == 82
|
|
|
|
|
|
def test_readonly_char6_member():
|
|
obj = m.WithCharArrayMember()
|
|
assert obj.char6_member == "Char6"
|
|
|
|
|
|
def test_readonly_const_char_ptr_member():
|
|
obj = m.WithConstCharPtrMember()
|
|
assert obj.const_char_ptr_member == "ConstChar*"
|