X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpyconfig.c;h=b5c01aaf1d5481256bf872e6d078c6e4b74dc15c;hb=0230ae236148230f50d24d120bbe84f9dd34dce0;hp=6f03da9b35fe05d44397378d35d612b4a51c7041;hpb=1f17cc084351bd1170385927d22fc9bd10ecd8d7;p=collectd.git

diff --git a/src/pyconfig.c b/src/pyconfig.c
index 6f03da9b..b5c01aaf 100644
--- a/src/pyconfig.c
+++ b/src/pyconfig.c
@@ -118,11 +118,31 @@ static int Config_init(PyObject *s, PyObject *args, PyObject *kwds) {
 	return 0;
 }
 
-/*static PyObject *Config_repr(PyObject *s) {
+static PyObject *Config_repr(PyObject *s) {
 	Config *self = (Config *) s;
+	PyObject *ret = NULL;
+	static PyObject *node_prefix = NULL, *root_prefix = NULL, *ending = NULL;
 	
-	return PyString_FromFormat("<collectd.Config %snode %s>", self->parent == Py_None ? "root " : "", PyString_AsString(PyObject_Str(self->key)));
-}*/
+	/* 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 ");
+	if (root_prefix == NULL)
+		root_prefix = cpy_string_to_unicode_or_bytes("<collectd.Config root node ");
+	if (ending == NULL)
+		ending = cpy_string_to_unicode_or_bytes(">");
+	if (node_prefix == NULL || root_prefix == NULL || ending == NULL)
+		return NULL;
+	
+	ret = PyObject_Str(self->key);
+	CPY_SUBSTITUTE(PyObject_Repr, ret, ret);
+	if (self->parent == NULL || self->parent == Py_None)
+		CPY_STRCAT(&ret, root_prefix);
+	else
+		CPY_STRCAT(&ret, node_prefix);
+	CPY_STRCAT(&ret, ending);
+	
+	return ret;
+}
 
 static int Config_traverse(PyObject *self, visitproc visit, void *arg) {
 	Config *c = (Config *) self;
@@ -130,8 +150,7 @@ static int Config_traverse(PyObject *self, visitproc visit, void *arg) {
 	Py_VISIT(c->key);
 	Py_VISIT(c->values);
 	Py_VISIT(c->children);
-	return 0;
-}
+	return 0;}
 
 static int Config_clear(PyObject *self) {
 	Config *c = (Config *) self;
@@ -165,7 +184,7 @@ PyTypeObject ConfigType = {
 	0,                         /* tp_getattr */
 	0,                         /* tp_setattr */
 	0,                         /* tp_compare */
-	0/*Config_repr*/,               /* tp_repr */
+	Config_repr,               /* tp_repr */
 	0,                         /* tp_as_number */
 	0,                         /* tp_as_sequence */
 	0,                         /* tp_as_mapping */