diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2007-05-18 17:15:44 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2007-05-18 17:15:44 (GMT) |
| commit | 1ab833082738ced53318aca05901e596d5ede683 (patch) | |
| tree | 0ff2b4c1fcbab3233e012f04bce801cadfd6d7f9 /Python | |
| parent | 14176a56d3fe36388115688d0b5acae0c759c044 (diff) | |
| download | cpython-1ab833082738ced53318aca05901e596d5ede683.zip cpython-1ab833082738ced53318aca05901e596d5ede683.tar.gz cpython-1ab833082738ced53318aca05901e596d5ede683.tar.bz2 | |
Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror
PyString_Concat() and PyString_ConcatAndDel() (the name PyUnicode_Concat()
was already taken).
Change PyObject_Repr() to always return a unicode object.
Update all repr implementations to return unicode objects.
Add a function PyObject_ReprStr8() that calls PyObject_Repr() and converts
the result to an 8bit string.
Use PyObject_ReprStr8() where using PyObject_Repr() can't be done
straightforward.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/errors.c | 2 | ||||
| -rw-r--r-- | Python/symtable.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Python/errors.c b/Python/errors.c index 443235a..4ef491f 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -54,7 +54,7 @@ PyErr_SetObject(PyObject *exception, PyObject *value) { if (exception != NULL && !PyExceptionClass_Check(exception)) { - PyObject *excstr = PyObject_Repr(exception); + PyObject *excstr = PyObject_ReprStr8(exception); PyErr_Format(PyExc_SystemError, "exception %s not a BaseException subclass", PyString_AS_STRING(excstr)); diff --git a/Python/symtable.c b/Python/symtable.c index 89c7914..58f673e 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -94,7 +94,7 @@ ste_repr(PySTEntryObject *ste) "<symtable entry %.100s(%ld), line %d>", PyString_AS_STRING(ste->ste_name), PyInt_AS_LONG(ste->ste_id), ste->ste_lineno); - return PyString_FromString(buf); + return PyUnicode_FromString(buf); } static void |