PyObject_CallMethodNoArgs(), PyObject_CallMethodOneArg() on python3.9

Author: ijl

src/serialize/datetime.rs

@@ -147,36 +147,18 @@ impl DateTime {
             let tzinfo = ffi!(PyDateTime_DATE_GET_TZINFO(self.ptr));
             if ffi!(PyObject_HasAttr(tzinfo, CONVERT_METHOD_STR)) == 1 {
                 // pendulum
-                let offset = ffi!(PyObject_CallMethodObjArgs(
-                    self.ptr,
-                    UTCOFFSET_METHOD_STR,
-                    std::ptr::null_mut() as *mut pyo3::ffi::PyObject
-                ));
+                let offset = call_method!(self.ptr, UTCOFFSET_METHOD_STR);
                 offset_second = ffi!(PyDateTime_DELTA_GET_SECONDS(offset)) as i32;
                 offset_day = ffi!(PyDateTime_DELTA_GET_DAYS(offset));
             } else if ffi!(PyObject_HasAttr(tzinfo, NORMALIZE_METHOD_STR)) == 1 {
                 // pytz
-                let method_ptr = ffi!(PyObject_CallMethodObjArgs(
-                    tzinfo,
-                    NORMALIZE_METHOD_STR,
-                    self.ptr,
-                    std::ptr::null_mut() as *mut pyo3::ffi::PyObject
-                ));
-                let offset = ffi!(PyObject_CallMethodObjArgs(
-                    method_ptr,
-                    UTCOFFSET_METHOD_STR,
-                    std::ptr::null_mut() as *mut pyo3::ffi::PyObject
-                ));
+                let method_ptr = call_method!(tzinfo, NORMALIZE_METHOD_STR, self.ptr);
+                let offset = call_method!(method_ptr, UTCOFFSET_METHOD_STR);
                 offset_second = ffi!(PyDateTime_DELTA_GET_SECONDS(offset)) as i32;
                 offset_day = ffi!(PyDateTime_DELTA_GET_DAYS(offset));
             } else if ffi!(PyObject_HasAttr(tzinfo, DST_STR)) == 1 {
                 // dateutil/arrow, datetime.timezone.utc
-                let offset = ffi!(PyObject_CallMethodObjArgs(
-                    tzinfo,
-                    UTCOFFSET_METHOD_STR,
-                    self.ptr,
-                    std::ptr::null_mut() as *mut pyo3::ffi::PyObject
-                ));
+                let offset = call_method!(tzinfo, UTCOFFSET_METHOD_STR, self.ptr);
                 offset_second = ffi!(PyDateTime_DELTA_GET_SECONDS(offset)) as i32;
                 offset_day = ffi!(PyDateTime_DELTA_GET_DAYS(offset));
             } else {

src/util.rs

@@ -63,3 +63,36 @@ macro_rules! ffi {
         unsafe { pyo3::ffi::$fn($obj1, $obj2, $obj3, $obj4) }
     };
 }
+
+#[cfg(python39)]
+macro_rules! call_method {
+    ($obj1:expr, $obj2:expr) => {
+        unsafe { pyo3::ffi::PyObject_CallMethodNoArgs($obj1, $obj2) }
+    };
+    ($obj1:expr, $obj2:expr, $obj3:expr) => {
+        unsafe { pyo3::ffi::PyObject_CallMethodOneArg($obj1, $obj2, $obj3) }
+    };
+}
+
+#[cfg(not(python39))]
+macro_rules! call_method {
+    ($obj1:expr, $obj2:expr) => {
+        unsafe {
+            pyo3::ffi::PyObject_CallMethodObjArgs(
+                $obj1,
+                $obj2,
+                std::ptr::null_mut() as *mut pyo3::ffi::PyObject,
+            )
+        }
+    };
+    ($obj1:expr, $obj2:expr, $obj3:expr) => {
+        unsafe {
+            pyo3::ffi::PyObject_CallMethodObjArgs(
+                $obj1,
+                $obj2,
+                $obj3,
+                std::ptr::null_mut() as *mut pyo3::ffi::PyObject,
+            )
+        }
+    };
+}