From 0b030d276a8c0246e9a582d0d4041048044ac025 Mon Sep 17 00:00:00 2001 From: Sven Trenkel Date: Fri, 18 Dec 2009 02:02:47 +0100 Subject: [PATCH] Config object repr string is back. --- src/cpython.h | 7 ++++++- src/pyconfig.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/cpython.h b/src/cpython.h index 88052970..001a3ae9 100644 --- a/src/cpython.h +++ b/src/cpython.h @@ -83,13 +83,18 @@ #endif #ifdef IS_PY3K + #define PyInt_FromLong PyLong_FromLong -//#define PyString_FromString PyBytes_FromString #define CPY_INIT_TYPE PyVarObject_HEAD_INIT(NULL, 0) #define IS_BYTES_OR_UNICODE(o) (PyUnicode_Check(o) || PyBytes_Check(o)) +#define CPY_STRCAT PyUnicode_Concat + #else + #define CPY_INIT_TYPE PyObject_HEAD_INIT(NULL) 0, #define IS_BYTES_OR_UNICODE(o) (PyUnicode_Check(o) || PyString_Check(o)) +#define CPY_STRCAT PyString_Concat + #endif static inline const char *cpy_unicode_or_bytes_to_string(PyObject **o) { diff --git a/src/pyconfig.c b/src/pyconfig.c index 6f03da9b..d794c9a8 100644 --- a/src/pyconfig.c +++ b/src/pyconfig.c @@ -118,11 +118,37 @@ 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 *name, *tmp, *ret = NULL; + static PyObject *node_prefix = NULL, *root_prefix = NULL, *ending = NULL; - return PyString_FromFormat("", 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(""); + if (node_prefix == NULL || root_prefix == NULL || ending == NULL) + return NULL; + + name = PyObject_Str(self->key); + if (name == NULL) + return NULL; + + if (self->parent == NULL || self->parent == Py_None) + tmp = CPY_STRCAT(root_prefix, name); + else + tmp = CPY_STRCAT(node_prefix, name); + + Py_DECREF(name); + if (tmp != NULL) + ret = CPY_STRCAT(tmp, ending); + Py_DECREF(tmp); + + return ret; +} static int Config_traverse(PyObject *self, visitproc visit, void *arg) { Config *c = (Config *) self; @@ -130,8 +156,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 +190,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 */ -- 2.30.2