diff --git a/src/python.c b/src/python.c
index 25681b6649e049f723107dc67ee298ca7761ecde..2f4f01e1e08b7e00777a969136dd67dd93fff7b0 100644 (file)
--- a/src/python.c
+++ b/src/python.c
@@ -568,7 +568,8 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd
user_data->data = c;
ts.tv_sec = interval;
ts.tv_nsec = (interval - ts.tv_sec) * 1000000000;
- plugin_register_complex_read(buf, cpy_read_callback, &ts, user_data);
+ plugin_register_complex_read(/* group = */ NULL, buf,
+ cpy_read_callback, &ts, user_data);
return cpy_string_to_unicode_or_bytes(buf);
}
@@ -691,18 +692,18 @@ static PyObject *cpy_unregister_generic_userdata(cpy_unregister_function_t *unre
PyErr_Clear();
if (!PyCallable_Check(arg)) {
PyErr_SetString(PyExc_TypeError, "This function needs a string or a callable object as its only parameter.");
- Py_DECREF(&arg);
+ Py_DECREF(arg);
return NULL;
}
cpy_build_name(buf, sizeof(buf), arg, NULL);
name = buf;
}
if (unreg(name) == 0) {
- Py_DECREF(&arg);
+ Py_DECREF(arg);
Py_RETURN_NONE;
}
PyErr_Format(PyExc_RuntimeError, "Unable to unregister %s callback '%s'.", desc, name);
- Py_DECREF(&arg);
+ Py_DECREF(arg);
return NULL;
}
@@ -895,6 +896,7 @@ static PyObject *cpy_oconfig_to_pyconfig(oconfig_item_t *ci, PyObject *parent) {
return item;
}
+#ifdef IS_PY3K
static struct PyModuleDef collectdmodule = {
PyModuleDef_HEAD_INIT,
"collectd", /* name of module */
PyMODINIT_FUNC PyInit_collectd(void) {
return PyModule_Create(&collectdmodule);
}
+#endif
static int cpy_config(oconfig_item_t *ci) {
int i;