From b4dc854585064a1df6874c9877cb59eededbd590 Mon Sep 17 00:00:00 2001
From: Lily Foote <code@lilyf.org>
Date: Sun, 18 Feb 2024 22:01:50 +0000
Subject: [PATCH] Convert LazyTypeObject to use the Bound API (#3855)

---
 pyo3-macros-backend/src/pyclass.rs    |  1 +
 src/impl_/pyclass/lazy_type_object.rs | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pyo3-macros-backend/src/pyclass.rs b/pyo3-macros-backend/src/pyclass.rs
index 7d8c868e..806df88e 100644
--- a/pyo3-macros-backend/src/pyclass.rs
+++ b/pyo3-macros-backend/src/pyclass.rs
@@ -1283,6 +1283,7 @@ fn impl_pytypeinfo(
 
             #[inline]
             fn type_object_raw(py: _pyo3::Python<'_>) -> *mut _pyo3::ffi::PyTypeObject {
+                use _pyo3::prelude::PyTypeMethods;
                 #deprecations
 
                 <#cls as _pyo3::impl_::pyclass::PyClassImpl>::lazy_type_object()
diff --git a/src/impl_/pyclass/lazy_type_object.rs b/src/impl_/pyclass/lazy_type_object.rs
index af52033a..1318e1ab 100644
--- a/src/impl_/pyclass/lazy_type_object.rs
+++ b/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,7 +46,7 @@ impl<T> LazyTypeObject<T> {
 
 impl<T: PyClass> LazyTypeObject<T> {
     /// Gets the type object contained by this `LazyTypeObject`, initializing it if needed.
-    pub fn get_or_init<'py>(&'py self, py: Python<'py>) -> &'py PyType {
+    pub fn get_or_init<'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)
@@ -54,7 +54,7 @@ impl<T: PyClass> LazyTypeObject<T> {
     }
 
     /// 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>(&self, py: Python<'py>) -> PyResult<&Bound<'py, PyType>> {
         self.0
             .get_or_try_init(py, create_type_object::<T>, T::NAME, T::items_iter())
     }
@@ -65,18 +65,18 @@ impl LazyTypeObjectInner {
     // so that this code is only instantiated once, instead of for every T
     // like the generic LazyTypeObject<T> methods above.
     fn get_or_try_init<'py>(
-        &'py self,
+        &self,
         py: Python<'py>,
         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 +91,7 @@ impl LazyTypeObjectInner {
 
     fn ensure_init(
         &self,
-        type_object: &PyType,
+        type_object: &Bound<'_, PyType>,
         name: &str,
         items_iter: PyClassItemsIter,
     ) -> PyResult<()> {