Added Py2&Py3 compatible cfl_PyInt abstraction

edenhill · edenhill · commit 64d7fa9356da · 2018-05-21T12:10:08.000+02:00
diff --git a/confluent_kafka/src/Producer.c b/confluent_kafka/src/Producer.c
@@ -237,7 +237,7 @@ int32_t Producer_partitioner_cb (const rd_kafka_topic_t *rkt,
 	Py_DECREF(args);
 
 	if (result) {
-		r = (int32_t)PyLong_AsLong(result);
+		r = (int32_t)cfl_PyInt_AsInt(result);
 		if (PyErr_Occurred())
 			printf("FIXME: partition_cb returned wrong type "
 			       "(expected long), how to propagate?\n");
@@ -450,7 +450,7 @@ static PyObject *Producer_poll (Handle *self, PyObject *args,
 	if (r == -1)
 		return NULL;
 
-	return PyLong_FromLong(r);
+	return cfl_PyInt_FromInt(r);
 }
 
 
@@ -478,7 +478,7 @@ static PyObject *Producer_flush (Handle *self, PyObject *args,
                         return NULL;
         }
 #endif
-        return PyLong_FromLong(qlen);
+        return cfl_PyInt_FromInt(qlen);
 }
 
 static PyMethodDef Producer_methods[] = {
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -66,7 +66,7 @@ typedef struct {
 
 
 static PyObject *KafkaError_code (KafkaError *self, PyObject *ignore) {
-	return PyLong_FromLong(self->code);
+	return cfl_PyInt_FromInt(self->code);
 }
 
 static PyObject *KafkaError_str (KafkaError *self, PyObject *ignore) {
@@ -157,7 +157,7 @@ static PyObject* KafkaError_richcompare (KafkaError *self, PyObject *o2,
 	if (Py_TYPE(o2) == &KafkaErrorType)
 		code2 = ((KafkaError *)o2)->code;
 	else
-		code2 = (int)PyLong_AsLong(o2);
+		code2 = cfl_PyInt_AsInt(o2);
 
 	switch (op)
 	{
@@ -340,7 +340,7 @@ static PyObject *Message_topic (Message *self, PyObject *ignore) {
 
 static PyObject *Message_partition (Message *self, PyObject *ignore) {
 	if (self->partition != RD_KAFKA_PARTITION_UA)
-		return PyLong_FromLong(self->partition);
+		return cfl_PyInt_FromInt(self->partition);
 	else
 		Py_RETURN_NONE;
 }
@@ -1912,12 +1912,35 @@ int cfl_PyObject_GetInt (PyObject *object, const char *attr_name, int *valp,
                 return 1;
         }
 
-        *valp = (int)PyLong_AsLong(o);
+        *valp = cfl_PyInt_AsInt(o);
         Py_DECREF(o);
 
         return 1;
 }
 
+
+/**
+ * @brief Checks that \p object is a bool (or boolable) and sets
+ *        \p *valp according to the object.
+ *
+ * @returns 1 if \p valp was set, or 0 if \p object is not a boolable object.
+ *          An exception is raised in the error case.
+ */
+int cfl_PyBool_get (PyObject *object, const char *name, int *valp) {
+        if (!PyBool_Check(object)) {
+                PyErr_Format(PyExc_TypeError,
+                             "Expected %s to be bool type, not %s",
+                             name,
+                             ((PyTypeObject *)PyObject_Type(object))->tp_name);
+                return 0;
+        }
+
+        *valp = object == Py_True;
+
+        return 1;
+}
+
+
 /**
  * @brief Get attribute \p attr_name from \p object and make sure it is
  *        a string type.
@@ -1983,7 +2006,7 @@ PyObject *cfl_int32_array_to_py_list (const int32_t *arr, size_t cnt) {
 
         for (i = 0 ; i < cnt ; i++)
                 PyList_SET_ITEM(list, (Py_ssize_t)i,
-                                PyLong_FromLong((long)arr[i]));
+                                cfl_PyInt_FromInt(arr[i]));
 
         return list;
 }
@@ -2083,7 +2106,7 @@ static char *KafkaError_add_errs (PyObject *dict, const char *origdoc) {
 		if (!descs[i].desc)
 			continue;
 
-		code = PyLong_FromLong(descs[i].code);
+		code = cfl_PyInt_FromInt(descs[i].code);
 
 		PyDict_SetItemString(dict, descs[i].name, code);
 
diff --git a/confluent_kafka/src/confluent_kafka.h b/confluent_kafka/src/confluent_kafka.h
@@ -263,13 +263,29 @@ void CallState_resume (CallState *cs);
 void CallState_crash (CallState *cs);
 
 
+/**
+ * @brief Python 3 renamed the internal PyInt type to PyLong, but the
+ *        type is still exposed as 'int' in Python.
+ *        We use the (cfl_)PyInt name for both Python 2 and 3 to mean an int,
+ *        assuming it will be at least 31 bits+signed on all platforms.
+ */
+#ifdef PY3
+#define cfl_PyInt_Check(o) PyLong_Check(o)
+#define cfl_PyInt_AsInt(o) (int)PyLong_AsLong(o)
+#define cfl_PyInt_FromInt(v) PyLong_FromLong(v)
+#else
+#define cfl_PyInt_Check(o) PyInt_Check(o)
+#define cfl_PyInt_AsInt(o) (int)PyInt_AsLong(o)
+#define cfl_PyInt_FromInt(v) PyInt_FromLong(v)
+#endif
+
 
 PyObject *cfl_PyObject_lookup (const char *modulename, const char *typename);
 
 void cfl_PyDict_SetString (PyObject *dict, const char *name, const char *val);
 void cfl_PyDict_SetInt (PyObject *dict, const char *name, int val);
 int cfl_PyObject_SetString (PyObject *o, const char *name, const char *val);
-int cfl_PyObject_SetLong (PyObject *o, const char *name, long val);
+int cfl_PyObject_SetInt (PyObject *o, const char *name, int val);
 int cfl_PyObject_GetAttr (PyObject *object, const char *attr_name,
                           PyObject **valp, const PyTypeObject *py_type,
                           int required);
