Fix crash with python 3.12

See python/cpython#105227 Signed-off-by: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
aviramha · Oct 3, 2023 · 32f91dd · 32f91dd
1 parent 729272a
commit 32f91dd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/src/serialize/dataclass.rs b/src/serialize/dataclass.rs
@@ -55,7 +55,7 @@ impl Serialize for DataclassGenericSerializer {
                 self.default,
             )
             .serialize(serializer)
-        } else if ffi!(PyDict_Contains((*ob_type).tp_dict, SLOTS_STR)) == 1 {
+        } else if pydict_contains!(ob_type, SLOTS_STR) {
             let ret = DataclassFallbackSerializer::new(
                 self.ptr,
                 self.opts,

diff --git a/src/serialize/serializer.rs b/src/serialize/serializer.rs
@@ -134,17 +134,15 @@ pub fn pyobject_to_obtype_unlikely(obj: *mut pyo3::ffi::PyObject, opts: Opt) ->
         ObType::List
     } else if opts & PASSTHROUGH_SUBCLASS == 0 && is_subclass!(ob_type, Py_TPFLAGS_DICT_SUBCLASS) {
         ObType::Dict
-    } else if opts & PASSTHROUGH_DATACLASS == 0
-        && ffi!(PyDict_Contains((*ob_type).tp_dict, DATACLASS_FIELDS_STR)) == 1
-    {
+    } else if opts & PASSTHROUGH_DATACLASS == 0 && pydict_contains!(ob_type, DATACLASS_FIELDS_STR) {
         ObType::Dataclass
     } else if opts & SERIALIZE_NUMPY != 0 && is_numpy_scalar(ob_type) {
         ObType::NumpyScalar
     } else if opts & SERIALIZE_NUMPY != 0 && is_numpy_array(ob_type) {
         ObType::NumpyArray
     } else if opts & SERIALIZE_PYDANTIC != 0
-        && (ffi!(PyDict_Contains((*ob_type).tp_dict, PYDANTIC_FIELDS_STR)) == 1
-            || ffi!(PyDict_Contains((*ob_type).tp_dict, PYDANTIC2_FIELDS_STR)) == 1)
+        && (pydict_contains!(ob_type, PYDANTIC_FIELDS_STR)
+            || pydict_contains!(ob_type, PYDANTIC2_FIELDS_STR))
     {
         ObType::Pydantic
     } else {

diff --git a/src/util.rs b/src/util.rs
@@ -98,3 +98,17 @@ macro_rules! call_method {
         }
     };
 }
+
+#[cfg(not(Py_3_12))]
+macro_rules! pydict_contains {
+    ($obj1:expr, $obj2:expr) => {
+        unsafe { pyo3::ffi::PyDict_Contains((*$obj1).tp_dict, $obj2) == 1 }
+    };
+}
+
+#[cfg(Py_3_12)]
+macro_rules! pydict_contains {
+    ($obj1:expr, $obj2:expr) => {
+        unsafe { pyo3::ffi::PyDict_Contains(pyo3::ffi::PyType_GetDict($obj1), $obj2) == 1 }
+    };
+}