mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror

Browse source 
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.
This commit is contained in:
Walter Dörwald 2007-05-18 17:15:44 +00:00
parent 14176a56d3
commit 1ab8330827
49 changed files with 385 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/itertoolsmodule.c
View file

@ -2084,7 +2084,7 @@ count_next(countobject *lz)
static PyObject *
count_repr(countobject *lz)
{
return PyString_FromFormat("count(%zd)", lz->cnt);
return PyUnicode_FromFormat("count(%zd)", lz->cnt);
}
PyDoc_STRVAR(count_doc,
@ -2396,11 +2396,11 @@ repeat_repr(repeatobject *ro)
return NULL;
if (ro->cnt == -1)
result = PyString_FromFormat("repeat(%s)",
PyString_AS_STRING(objrepr));
result = PyUnicode_FromFormat("repeat(%U)",
objrepr);
else
result = PyString_FromFormat("repeat(%s, %zd)",
PyString_AS_STRING(objrepr), ro->cnt);
result = PyUnicode_FromFormat("repeat(%U, %zd)",
objrepr, ro->cnt);
Py_DECREF(objrepr);
return result;
}