Add 'PyObject_GetOptionalAttr' compat

Author: bschoenmaeckers

newsfragments/5944.added.md

@@ -1 +1 @@
-add `pyo3-ffi::compat::PyObject_HasAttrWithError`
+add `pyo3-ffi::compat::PyObject_HasAttrWithError` & `pyo3-ffi::compat::PyObject_GetOptionalAttr`

pyo3-ffi/src/compat/py_3_13.rs

@@ -135,10 +135,29 @@ compat_function!(
     originally_defined_for(Py_3_13);
 
     #[inline]
-    pub unsafe fn PyObject_HasAttrWithError(obj: *mut crate::PyObject, attr: *mut crate::PyObject) -> std::ffi::c_int {
-        let res: *mut crate::PyObject = std::ptr::null_mut();
-        let rc = crate::PyObject_GetOptionalAttr(obj, attr, &mut result);
+    pub unsafe fn PyObject_HasAttrWithError(obj: *mut crate::PyObject, attr_name: *mut crate::PyObject) -> std::ffi::c_int {
+        let mut res: *mut crate::PyObject = std::ptr::null_mut();
+        let rc = crate::compat::PyObject_GetOptionalAttr(obj, attr_name, &mut res);
         crate::Py_XDECREF(res);
         rc
     }
 );
+
+compat_function!(
+    originally_defined_for(Py_3_13);
+
+    #[inline]
+    pub unsafe fn PyObject_GetOptionalAttr(obj: *mut crate::PyObject, attr_name: *mut crate::PyObject, result: *mut *mut crate::PyObject,) -> std::ffi::c_int {
+        *result = crate::PyObject_GetAttr(obj, attr_name);
+        if !(*result).is_null() {
+            1
+        } else if crate::PyErr_Occurred().is_null() {
+            0
+        } else if crate::PyErr_ExceptionMatches(crate::PyExc_AttributeError) > 0 {
+            crate::PyErr_Clear();
+            0
+        } else {
+            -1
+        }
+    }
+);

src/types/any.rs

@@ -1026,39 +1026,24 @@ impl<'py> PyAnyMethods<'py> for Bound<'py, PyAny> {
             any: &Bound<'py, PyAny>,
             attr_name: Borrowed<'_, 'py, PyString>,
         ) -> PyResult<Option<Bound<'py, PyAny>>> {
-            #[cfg(Py_3_13)]
-            {
-                let mut resp_ptr: *mut ffi::PyObject = std::ptr::null_mut();
-                match unsafe {
-                    ffi::PyObject_GetOptionalAttr(any.as_ptr(), attr_name.as_ptr(), &mut resp_ptr)
-                } {
-                    // Attribute found, result is a new strong reference
-                    1 => {
-                        let bound = unsafe { Bound::from_owned_ptr(any.py(), resp_ptr) };
-                        Ok(Some(bound))
-                    }
-                    // Attribute not found, result is NULL
-                    0 => Ok(None),
-
-                    // An error occurred (other than AttributeError)
-                    _ => Err(PyErr::fetch(any.py())),
+            let mut resp_ptr: *mut ffi::PyObject = std::ptr::null_mut();
+            match unsafe {
+                ffi::compat::PyObject_GetOptionalAttr(
+                    any.as_ptr(),
+                    attr_name.as_ptr(),
+                    &mut resp_ptr,
+                )
+            } {
+                // Attribute found, result is a new strong reference
+                1 => {
+                    let bound = unsafe { Bound::from_owned_ptr(any.py(), resp_ptr) };
+                    Ok(Some(bound))
                 }
-            }
+                // Attribute not found, result is NULL
+                0 => Ok(None),
 
-            #[cfg(not(Py_3_13))]
-            {
-                match any.getattr(attr_name) {
-                    Ok(bound) => Ok(Some(bound)),
-                    Err(err) => {
-                        let err_type = err
-                            .get_type(any.py())
-                            .is(PyType::new::<PyAttributeError>(any.py()));
-                        match err_type {
-                            true => Ok(None),
-                            false => Err(err),
-                        }
-                    }
-                }
+                // An error occurred (other than AttributeError)
+                _ => Err(PyErr::fetch(any.py())),
             }
         }