python: Fixed more unicode related problems.

[collectd.git] / src / cpython.h

diff --git a/src/cpython.h b/src/cpython.h
index 8805297..8c7ad65 100644 (file)
--- a/src/cpython.h
+++ b/src/cpython.h
@@ -74,6 +74,20 @@
 # define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
 #endif
 
+/* This macro is a shortcut for calls like
+ * x = PyObject_Repr(x);
+ * This can't be done like this example because this would leak
+ * a reference the the original x and crash in case of x == NULL.
+ * This calling syntax is less than elegant but it works, saves
+ * a lot of lines and avoids potential refcount errors. */
+
+#define CPY_SUBSTITUTE(func, a, ...) do {\
+       if ((a) != NULL) {\
+               PyObject *__tmp = (a);\
+               (a) = func(__VA_ARGS__);\
+               Py_DECREF(__tmp);\
+       }\
+} while(0)
 
 /* Python3 compatibility layer. To keep the actual code as clean as possible
  * do a lot of defines here. */
@@ -83,13 +97,18 @@
 #endif
 
 #ifdef IS_PY3K
+
 #define PyInt_FromLong PyLong_FromLong
-//#define PyString_FromString PyBytes_FromString
 #define CPY_INIT_TYPE         PyVarObject_HEAD_INIT(NULL, 0)
 #define IS_BYTES_OR_UNICODE(o) (PyUnicode_Check(o) || PyBytes_Check(o))
+#define CPY_STRCAT PyUnicode_Concat
+
 #else
+
 #define CPY_INIT_TYPE         PyObject_HEAD_INIT(NULL) 0,
 #define IS_BYTES_OR_UNICODE(o) (PyUnicode_Check(o) || PyString_Check(o))
+#define CPY_STRCAT PyString_Concat
+
 #endif
 
 static inline const char *cpy_unicode_or_bytes_to_string(PyObject **o) {