refactor: use py::type::of

Author: henryiii

docs/advanced/classes.rst

@@ -1247,6 +1247,6 @@ object, just like ``type(ob)`` in Python.
 
 .. note::
 
-    Other types, like ``py::type::of<int>``, do not work, see :ref:`type-conversions`.
+    Other types, like ``py::type::of<int>()``, do not work, see :ref:`type-conversions`.
 
 .. versionadded:: 2.6

include/pybind11/pytypes.h

@@ -895,10 +895,9 @@ class iterator : public object {
 
 class type : public object {
 public:
-    PYBIND11_OBJECT_COMMON(type, object, PyType_Check)
+    PYBIND11_OBJECT(type, object, PyType_Check)
 
-    explicit type(handle h): type((PyObject*) Py_TYPE(h.ptr()), borrowed_t{}) {}
-    explicit type(object ob): type((PyObject*) Py_TYPE(ob.ptr()), borrowed_t{}) {}
+    static type of(handle h) { return type((PyObject*) Py_TYPE(h.ptr()), borrowed_t{}); }
 
     /// Convert C++ type to py::type if previously registered. Does not convert
     // standard types, like int, float. etc. yet.

tests/test_class.cpp

@@ -148,8 +148,16 @@ TEST_SUBMODULE(class_, m) {
             return py::type::of<Invalid>();
     });
 
-    m.def("get_type", [](py::object ob) {
-        return py::type(ob);
+    m.def("get_type_of", [](py::object ob) {
+        return py::type::of(ob);
+    });
+
+    m.def("as_type", [](py::object ob) {
+        auto tp = py::type(ob);
+        if (py::isinstance<py::type>(ob))
+            return tp;
+        else
+            throw std::runtime_error("Invalid type");
     });
 
     // test_mismatched_holder

tests/test_class.py

@@ -39,15 +39,25 @@ def test_type():
     # assert m.check_type(2) == int
 
 
-def test_type_py():
-    assert m.get_type(1) == int
-    assert m.get_type(m.DerivedClass1()) == m.DerivedClass1
-    assert m.get_type(int) == type
+def test_type_of_py():
+    assert m.get_type_of(1) == int
+    assert m.get_type_of(m.DerivedClass1()) == m.DerivedClass1
+    assert m.get_type_of(int) == type
 
 
-def test_type_py_nodelete():
+def test_type_of_py_nodelete():
     # If the above test deleted the class, this will segfault
-    assert m.get_type(m.DerivedClass1()) == m.DerivedClass1
+    assert m.get_type_of(m.DerivedClass1()) == m.DerivedClass1
+
+
+def test_as_type_py():
+    assert m.as_type(int) == int
+
+    with pytest.raises(RuntimeError):
+        assert m.as_type(1) == int
+
+    with pytest.raises(RuntimeError):
+        assert m.as_type(m.DerivedClass1()) == m.DerivedClass1
 
 
 def test_docstrings(doc):