fix: type bug intruduced in pybind#2492

This now tests the old form too, and fixes the bug introduced.

Author: henryiii

include/pybind11/pytypes.h

@@ -1581,7 +1581,7 @@ str_attr_accessor object_api<D>::doc() const { return attr("__doc__"); }
 
 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(*this); }
+handle object_api<D>::get_type() const { return type::handle_of(derived()); }
 
 template <typename D>
 bool object_api<D>::rich_compare(object_api const &other, int value) const {

tests/test_class.cpp

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

tests/test_class.py

@@ -45,6 +45,12 @@ def test_type_of_py():
     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():
     # If the above test deleted the class, this will segfault
     assert m.get_type_of(m.DerivedClass1()) == m.DerivedClass1