Convert LazyTypeObject to use the Bound API

Author: LilyAcorn

guide/src/class.md

@@ -1239,8 +1239,8 @@ unsafe impl pyo3::type_object::PyTypeInfo for MyClass {
     #[inline]
     fn type_object_raw(py: pyo3::Python<'_>) -> *mut pyo3::ffi::PyTypeObject {
         <Self as pyo3::impl_::pyclass::PyClassImpl>::lazy_type_object()
-            .get_or_init(py)
-            .as_type_ptr()
+            .get_or_init_bound(py)
+            .as_ptr() as *mut pyo3::ffi::PyTypeObject
     }
 }
 

pyo3-macros-backend/src/pyclass.rs

@@ -1286,8 +1286,8 @@ fn impl_pytypeinfo(
                 #deprecations
 
                 <#cls as _pyo3::impl_::pyclass::PyClassImpl>::lazy_type_object()
-                    .get_or_init(py)
-                    .as_type_ptr()
+                    .get_or_init_bound(py)
+                    .as_ptr() as *mut _pyo3::ffi::PyTypeObject
             }
         }
     }

src/impl_/pyclass/lazy_type_object.rs

@@ -12,7 +12,7 @@ use crate::{
     pyclass::{create_type_object, PyClassTypeObject},
     sync::{GILOnceCell, GILProtected},
     types::PyType,
-    PyClass, PyErr, PyMethodDefType, PyObject, PyResult, Python,
+    Bound, PyClass, PyErr, PyMethodDefType, PyObject, PyResult, Python,
 };
 
 use super::PyClassItemsIter;
@@ -46,15 +46,30 @@ impl<T> LazyTypeObject<T> {
 
 impl<T: PyClass> LazyTypeObject<T> {
     /// Gets the type object contained by this `LazyTypeObject`, initializing it if needed.
+    #[cfg_attr(
+        not(feature = "gil-refs"),
+        deprecated(
+            since = "0.21.0",
+            note = "`LazyTypeObject::get_or_init` will be replaced by `LazyTypeObject::get_or_init_bound` in a future PyO3 version"
+        )
+    )]
     pub fn get_or_init<'py>(&'py self, py: Python<'py>) -> &'py PyType {
+        self.get_or_init_bound(py).as_gil_ref()
+    }
+
+    /// Gets the type object contained by this `LazyTypeObject`, initializing it if needed.
+    pub fn get_or_init_bound<'py>(&'py self, py: Python<'py>) -> &Bound<'py, PyType> {
         self.get_or_try_init(py).unwrap_or_else(|err| {
             err.print(py);
             panic!("failed to create type object for {}", T::NAME)
         })
     }
 
     /// Fallible version of the above.
-    pub(crate) fn get_or_try_init<'py>(&'py self, py: Python<'py>) -> PyResult<&'py PyType> {
+    pub(crate) fn get_or_try_init<'py>(
+        &'py self,
+        py: Python<'py>,
+    ) -> PyResult<&Bound<'py, PyType>> {
         self.0
             .get_or_try_init(py, create_type_object::<T>, T::NAME, T::items_iter())
     }
@@ -70,13 +85,13 @@ impl LazyTypeObjectInner {
         init: fn(Python<'py>) -> PyResult<PyClassTypeObject>,
         name: &str,
         items_iter: PyClassItemsIter,
-    ) -> PyResult<&'py PyType> {
+    ) -> PyResult<&Bound<'py, PyType>> {
         (|| -> PyResult<_> {
             let type_object = self
                 .value
                 .get_or_try_init(py, || init(py))?
                 .type_object
-                .as_ref(py);
+                .bind(py);
             self.ensure_init(type_object, name, items_iter)?;
             Ok(type_object)
         })()
@@ -91,7 +106,7 @@ impl LazyTypeObjectInner {
 
     fn ensure_init(
         &self,
-        type_object: &PyType,
+        type_object: &Bound<'_, PyType>,
         name: &str,
         items_iter: PyClassItemsIter,
     ) -> PyResult<()> {