* DEALINGS IN THE SOFTWARE.
*
* Authors:
- * Sven Trenkel <collectd at semidefinite.de>
+ * Sven Trenkel <collectd at semidefinite.de>
**/
#include <Python.h>
#include <structmember.h>
#include "collectd.h"
+
#include "common.h"
#include "cpython.h"
static PyObject *Config_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
Config *self;
-
+
self = (Config *) type->tp_alloc(type, 0);
if (self == NULL)
return NULL;
-
+
self->parent = NULL;
self->key = NULL;
self->values = NULL;
PyObject *key = NULL, *parent = NULL, *values = NULL, *children = NULL, *tmp;
Config *self = (Config *) s;
static char *kwlist[] = {"key", "parent", "values", "children", NULL};
-
+
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|OOO", kwlist,
&key, &parent, &values, &children))
return -1;
-
+
if (!IS_BYTES_OR_UNICODE(key)) {
PyErr_SetString(PyExc_TypeError, "argument 1 must be str");
Py_XDECREF(parent);
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;
}