Mercurial > cpython-lru_cache-weakref
diff Objects/sliceobject.c @ 41769:b29d71d43c80
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.
| author | Walter Dörwald <walter@livinglogic.de> |
|---|---|
| date | Fri, 18 May 2007 17:15:44 +0000 |
| parents | 06145fbc7ab9 |
| children | bee8d01ef42c |
line wrap: on
line diff
--- a/Objects/sliceobject.c Fri May 18 17:04:42 2007 +0000 +++ b/Objects/sliceobject.c Fri May 18 17:15:44 2007 +0000 @@ -19,7 +19,7 @@ static PyObject * ellipsis_repr(PyObject *op) { - return PyString_FromString("Ellipsis"); + return PyUnicode_FromString("Ellipsis"); } static PyTypeObject PyEllipsis_Type = { @@ -228,14 +228,14 @@ { PyObject *s, *comma; - s = PyString_FromString("slice("); - comma = PyString_FromString(", "); - PyString_ConcatAndDel(&s, PyObject_Repr(r->start)); - PyString_Concat(&s, comma); - PyString_ConcatAndDel(&s, PyObject_Repr(r->stop)); - PyString_Concat(&s, comma); - PyString_ConcatAndDel(&s, PyObject_Repr(r->step)); - PyString_ConcatAndDel(&s, PyString_FromString(")")); + s = PyUnicode_FromString("slice("); + comma = PyUnicode_FromString(", "); + PyUnicode_AppendAndDel(&s, PyObject_Repr(r->start)); + PyUnicode_Append(&s, comma); + PyUnicode_AppendAndDel(&s, PyObject_Repr(r->stop)); + PyUnicode_Append(&s, comma); + PyUnicode_AppendAndDel(&s, PyObject_Repr(r->step)); + PyUnicode_AppendAndDel(&s, PyUnicode_FromString(")")); Py_DECREF(comma); return s; }
