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

fix: type bug intruduced in #2492

Browse Source 
This now tests the old form too, and fixes the bug introduced.
This commit is contained in:
Henry Fredrick Schreiner 2020-09-16 22:02:09 -04:00 committed by Henry Schreiner
parent dec33c29f2
commit 11f756f5a9
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/pybind11/pytypes.h
View File

@ -153,7 +153,7 @@ public:
/// Return the object's current reference count /// Return the object's current reference count
int ref_count() const { return static_cast<int>(Py_REFCNT(derived().ptr())); } int ref_count() const { return static_cast<int>(Py_REFCNT(derived().ptr())); }
PYBIND11_DEPRECATED("Call py::type::handle_of(h) or py::type::of(h) instead of h.get_type()") // TODO PYBIND11_DEPRECATED("Call py::type::handle_of(h) or py::type::of(h) instead of h.get_type()")
handle get_type() const; handle get_type() const;
private: private:
@ -1580,8 +1580,7 @@ template <typename D>
str_attr_accessor object_api<D>::doc() const { return attr("__doc__"); } str_attr_accessor object_api<D>::doc() const { return attr("__doc__"); }
template <typename D> template <typename D>
PYBIND11_DEPRECATED("Use py::type::of(h) instead of h.get_type()") handle object_api<D>::get_type() const { return type::handle_of(derived()); }
handle object_api<D>::get_type() const { return type::handle_of(*this); }
template <typename D> template <typename D>
bool object_api<D>::rich_compare(object_api const &other, int value) const { bool object_api<D>::rich_compare(object_api const &other, int value) const {

4
tests/test_class.cpp
View File

@ -152,6 +152,10 @@ TEST_SUBMODULE(class_, m) {
return py::type::of(ob); return py::type::of(ob);
}); });
m.def("get_type_classic", [](py::handle h) {
return h.get_type();
});
m.def("as_type", [](py::object ob) { m.def("as_type", [](py::object ob) {
auto tp = py::type(ob); auto tp = py::type(ob);
if (py::isinstance<py::type>(ob)) if (py::isinstance<py::type>(ob))

6
tests/test_class.py
View File

@ -45,6 +45,12 @@ def test_type_of_py():
assert m.get_type_of(int) == type assert m.get_type_of(int) == type
def test_type_of_classic():
assert m.get_type_classic(1) == int
assert m.get_type_classic(m.DerivedClass1()) == m.DerivedClass1
assert m.get_type_classic(int) == type
def test_type_of_py_nodelete(): def test_type_of_py_nodelete():
# If the above test deleted the class, this will segfault # If the above test deleted the class, this will segfault
assert m.get_type_of(m.DerivedClass1()) == m.DerivedClass1 assert m.get_type_of(m.DerivedClass1()) == m.DerivedClass1