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 /Objects/fileobject.c | |
| 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 'Objects/fileobject.c')
| -rw-r--r-- | Objects/fileobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c index e195450..7c8e2b2 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -406,7 +406,7 @@ file_repr(PyFileObject *f) PyObject *ret = NULL; PyObject *name = PyUnicode_AsUnicodeEscapeString(f->f_name); const char *name_str = name ? PyString_AsString(name) : "?"; - ret = PyString_FromFormat("<%s file u'%s', mode '%s' at %p>", + ret = PyUnicode_FromFormat("<%s file u'%s', mode '%s' at %p>", f->f_fp == NULL ? "closed" : "open", name_str, PyString_AsString(f->f_mode), @@ -414,7 +414,7 @@ file_repr(PyFileObject *f) Py_XDECREF(name); return ret; } else { - return PyString_FromFormat("<%s file '%s', mode '%s' at %p>", + return PyUnicode_FromFormat("<%s file '%s', mode '%s' at %p>", f->f_fp == NULL ? "closed" : "open", PyString_AsString(f->f_name), PyString_AsString(f->f_mode), @@ -2142,7 +2142,7 @@ PyFile_WriteObject(PyObject *v, PyObject *f, int flags) value = PyObject_Str(v); } else - value = PyObject_Repr(v); + value = PyObject_ReprStr8(v); if (value == NULL) { Py_DECREF(writer); return -1; |