couple fixes

Author: TingDaoK

source/cbor.c

@@ -220,26 +220,21 @@ static PyObject *s_cbor_encoder_write_pyobject(struct aws_cbor_encoder *encoder,
         result = s_cbor_encoder_write_pydict(encoder, py_object);
     } else {
         /* Check for datetime using stable ABI (slower, so checked last) */
-        int is_dt = aws_py_is_datetime_instance(py_object);
-        if (is_dt < 0) {
+        bool is_datetime = false;
+        if (aws_py_is_datetime_instance(py_object, &is_datetime) != AWS_OP_SUCCESS) {
             /* Error occurred during datetime check */
             result = NULL;
-        } else if (is_dt > 0) {
+        } else if (is_datetime) {
             /* Convert datetime to CBOR epoch time (tag 1) */
-            PyObject *timestamp_method = PyObject_GetAttrString(py_object, "timestamp");
-            if (timestamp_method) {
-                PyObject *timestamp = PyObject_CallNoArgs(timestamp_method);
-                Py_DECREF(timestamp_method);
-                if (timestamp) {
-                    /* Write CBOR tag 1 (epoch time) + timestamp */
-                    aws_cbor_encoder_write_tag(encoder, AWS_CBOR_TAG_EPOCH_TIME);
-                    result = s_cbor_encoder_write_pyobject_as_float(encoder, timestamp);
-                    Py_DECREF(timestamp);
-                } else {
-                    result = NULL; /* timestamp() call failed */
-                }
+            /* Call timestamp() method - PyObject_CallMethod is more idiomatic and compatible with Python 3.8+ */
+            PyObject *timestamp = PyObject_CallMethod(py_object, "timestamp", NULL);
+            if (timestamp) {
+                /* Write CBOR tag 1 (epoch time) + timestamp */
+                aws_cbor_encoder_write_tag(encoder, AWS_CBOR_TAG_EPOCH_TIME);
+                result = s_cbor_encoder_write_pyobject_as_float(encoder, timestamp);
+                Py_DECREF(timestamp);
             } else {
-                result = NULL; /* Failed to get timestamp method */
+                result = NULL; /* timestamp() call failed */
             }
         } else {
             /* Unsupported type */

source/module.c

@@ -43,36 +43,47 @@ static PyObject *s_datetime_class = NULL;
 
 static int s_init_datetime_cache(void) {
     if (s_datetime_class) {
-        return 0; /* Already initialized */
+        return AWS_OP_SUCCESS; /* Already initialized */
     }
 
     /* Import datetime module */
     PyObject *datetime_module = PyImport_ImportModule("datetime");
     if (!datetime_module) {
-        return -1;
+        /* Python exception already set by PyImport_ImportModule */
+        return aws_py_raise_error();
     }
 
     /* Get datetime class - new reference we'll keep */
     s_datetime_class = PyObject_GetAttrString(datetime_module, "datetime");
     Py_DECREF(datetime_module);
 
     if (!s_datetime_class) {
-        return -1;
+        /* Python exception already set by PyObject_GetAttrString */
+        return aws_py_raise_error();
     }
 
-    return 0;
+    return AWS_OP_SUCCESS;
 }
 
 // static void s_cleanup_datetime_cache(void) {
 //     Py_XDECREF(s_datetime_class);
 //     s_datetime_class = NULL;
 // }
 
-int aws_py_is_datetime_instance(PyObject *obj) {
-    if (!s_datetime_class && s_init_datetime_cache() < 0) {
-        return -1;
+int aws_py_is_datetime_instance(PyObject *obj, bool *out_is_datetime) {
+    AWS_ASSERT(out_is_datetime);
+
+    if (!s_datetime_class && s_init_datetime_cache() != AWS_OP_SUCCESS) {
+        return AWS_OP_ERR;
+    }
+
+    int result = PyObject_IsInstance(obj, s_datetime_class);
+    if (result < 0) {
+        return AWS_OP_ERR; /* PyObject_IsInstance failed */
     }
-    return PyObject_IsInstance(obj, s_datetime_class);
+
+    *out_is_datetime = (result != 0);
+    return AWS_OP_SUCCESS;
 }
 
 PyObject *aws_py_init_logging(PyObject *self, PyObject *args) {

source/module.h

@@ -72,12 +72,12 @@ struct aws_byte_cursor aws_byte_cursor_from_pybytes(PyObject *py_bytes);
 
 /**
  * Check if a PyObject is an instance of datetime.datetime using stable ABI.
- * Returns:
- *  1 if obj is a datetime instance
- *  0 if obj is not a datetime instance
- * -1 on error (Python exception set)
+ *
+ * @param obj PyObject to check
+ * @param out_is_datetime Pointer to store result (true if datetime, false otherwise)
+ * @return AWS_OP_SUCCESS on success, AWS_OP_ERR on error (Python exception set)
  */
-int aws_py_is_datetime_instance(PyObject *obj);
+int aws_py_is_datetime_instance(PyObject *obj, bool *out_is_datetime);
 
 /* Set current thread's error indicator based on aws_last_error() */
 void PyErr_SetAwsLastError(void);