X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fpyconfig.c;h=32b31cc548db947de28f7022666dcb20268c230e;hb=bed961ab910f1cf5d96d1e60af0227431a38bbf3;hp=d794c9a8a1556c223149289b04943472e789bede;hpb=0b030d276a8c0246e9a582d0d4041048044ac025;p=collectd.git

diff --git a/src/pyconfig.c b/src/pyconfig.c
index d794c9a8..32b31cc5 100644
--- a/src/pyconfig.c
+++ b/src/pyconfig.c
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *   Sven Trenkel <collectd at semidefinite.de>  
+ *   Sven Trenkel <collectd at semidefinite.de>
  **/
 
 #include <Python.h>
@@ -57,11 +57,11 @@ static char children_doc[] = "This is a tuple of child nodes. For most nodes thi
 
 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;
@@ -73,11 +73,11 @@ static int Config_init(PyObject *s, PyObject *args, PyObject *kwds) {
 	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);
@@ -120,33 +120,27 @@ static int Config_init(PyObject *s, PyObject *args, PyObject *kwds) {
 
 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;
 }