Merge pull request #3683 from PyO3/use-type-ref-helper

Some boy scouting w.r.t. usage of our internal helper functions when handling collection ABC
PyO3 · Dec 21, 2023 · 5b12cf1 · 5b12cf1
2 parents 7f626b2 + 3c97167
commit 5b12cf1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/src/sync.rs b/src/sync.rs
@@ -1,5 +1,5 @@
 //! Synchronization mechanisms based on the Python GIL.
-use crate::{types::PyString, types::PyType, Py, PyErr, PyVisit, Python};
+use crate::{types::PyString, types::PyType, Py, PyResult, PyVisit, Python};
 use std::cell::UnsafeCell;
 
 /// Value with concurrent access protected by the GIL.
@@ -196,7 +196,7 @@ impl GILOnceCell<Py<PyType>> {
         py: Python<'py>,
         module_name: &str,
         attr_name: &str,
-    ) -> Result<&'py PyType, PyErr> {
+    ) -> PyResult<&'py PyType> {
         self.get_or_try_init(py, || py.import(module_name)?.getattr(attr_name)?.extract())
             .map(|ty| ty.as_ref(py))
     }

diff --git a/src/types/mapping.rs b/src/types/mapping.rs
@@ -240,14 +240,10 @@ impl<'py> PyMappingMethods<'py> for Py2<'py, PyMapping> {
     }
 }
 
-static MAPPING_ABC: GILOnceCell<Py<PyType>> = GILOnceCell::new();
-
 fn get_mapping_abc(py: Python<'_>) -> PyResult<&PyType> {
-    MAPPING_ABC
-        .get_or_try_init(py, || {
-            py.import("collections.abc")?.getattr("Mapping")?.extract()
-        })
-        .map(|ty| ty.as_ref(py))
+    static MAPPING_ABC: GILOnceCell<Py<PyType>> = GILOnceCell::new();
+
+    MAPPING_ABC.get_or_try_init_type_ref(py, "collections.abc", "Mapping")
 }
 
 impl PyTypeCheck for PyMapping {
@@ -260,8 +256,10 @@ impl PyTypeCheck for PyMapping {
         PyDict::is_type_of(object)
             || get_mapping_abc(object.py())
                 .and_then(|abc| object.is_instance(abc))
-                // TODO: surface errors in this chain to the user
-                .unwrap_or(false)
+                .unwrap_or_else(|err| {
+                    err.write_unraisable(object.py(), Some(object));
+                    false
+                })
     }
 }
 

diff --git a/src/types/sequence.rs b/src/types/sequence.rs
@@ -523,14 +523,10 @@ where
     Ok(v)
 }
 
-static SEQUENCE_ABC: GILOnceCell<Py<PyType>> = GILOnceCell::new();
-
 fn get_sequence_abc(py: Python<'_>) -> PyResult<&PyType> {
-    SEQUENCE_ABC
-        .get_or_try_init(py, || {
-            py.import("collections.abc")?.getattr("Sequence")?.extract()
-        })
-        .map(|ty| ty.as_ref(py))
+    static SEQUENCE_ABC: GILOnceCell<Py<PyType>> = GILOnceCell::new();
+
+    SEQUENCE_ABC.get_or_try_init_type_ref(py, "collections.abc", "Sequence")
 }
 
 impl PyTypeCheck for PySequence {
@@ -544,8 +540,10 @@ impl PyTypeCheck for PySequence {
             || PyTuple::is_type_of(object)
             || get_sequence_abc(object.py())
                 .and_then(|abc| object.is_instance(abc))
-                // TODO: surface errors in this chain to the user
-                .unwrap_or(false)
+                .unwrap_or_else(|err| {
+                    err.write_unraisable(object.py(), Some(object));
+                    false
+                })
     }
 }