diff --git a/src/pyconfig.c b/src/pyconfig.c
index d794c9a8a1556c223149289b04943472e789bede..b5c01aaf1d5481256bf872e6d078c6e4b74dc15c 100644 (file)
--- a/src/pyconfig.c
+++ b/src/pyconfig.c
static PyObject *Config_repr(PyObject *s) {
Config *self = (Config *) s;
- PyObject *name, *tmp, *ret = NULL;
+ PyObject *ret = NULL;
static PyObject *node_prefix = NULL, *root_prefix = NULL, *ending = NULL;
/* This is ok because we have the GIL, so this is thread-save by default. */
if (node_prefix == NULL)
- node_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config node '");
+ node_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config node ");
if (root_prefix == NULL)
- root_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config root node '");
+ root_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config root node ");
if (ending == NULL)
- ending = cpy_string_to_unicode_or_bytes("'>");
+ ending = cpy_string_to_unicode_or_bytes(">");
if (node_prefix == NULL || root_prefix == NULL || ending == NULL)
return NULL;
- name = PyObject_Str(self->key);
- if (name == NULL)
- return NULL;
-
+ ret = PyObject_Str(self->key);
+ CPY_SUBSTITUTE(PyObject_Repr, ret, ret);
if (self->parent == NULL || self->parent == Py_None)
- tmp = CPY_STRCAT(root_prefix, name);
+ CPY_STRCAT(&ret, root_prefix);
else
- tmp = CPY_STRCAT(node_prefix, name);
-
- Py_DECREF(name);
- if (tmp != NULL)
- ret = CPY_STRCAT(tmp, ending);
- Py_DECREF(tmp);
+ CPY_STRCAT(&ret, node_prefix);
+ CPY_STRCAT(&ret, ending);
return ret;
}