projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50b2116
)
Fixed string repr for config nodes.
author
Sven Trenkel
<collectd@semidefinite.de>
Tue, 22 Dec 2009 01:30:40 +0000
(
02:30
+0100)
committer
Florian Forster
<octo@noris.net>
Tue, 5 Jan 2010 10:02:40 +0000
(11:02 +0100)
src/pyconfig.c
patch
|
blob
|
history
diff --git
a/src/pyconfig.c
b/src/pyconfig.c
index
53e80e4
..
258d31f
100644
(file)
--- a/
src/pyconfig.c
+++ b/
src/pyconfig.c
@@
-125,15
+125,16
@@
static PyObject *Config_repr(PyObject *s) {
/* This is ok because we have the GIL, so this is thread-save by default. */
if (node_prefix == 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)
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)
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;
ret = PyObject_Str(self->key);
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_SUBSTITUTE(CPY_STRCAT, ret, root_prefix, ret);
else
if (self->parent == NULL || self->parent == Py_None)
CPY_SUBSTITUTE(CPY_STRCAT, ret, root_prefix, ret);
else