mirror of
https://github.com/python/cpython.git
synced 2025-12-04 00:30:19 +00:00
Add a format specifier %R to PyUnicode_FromFormat(), which embeds
the result of a call to PyObject_Repr() into the string. This makes it possible to simplify many repr implementations. PyUnicode_FromFormat() uses two steps to create the final string: A first pass through the format string determines the size of the final string and a second pass creates the string. To avoid calling PyObject_Repr() twice for each %R specifier, PyObject_Repr() is called during the size calculation step and the results are stored in an array (whose size is determined at the start by counting %R specifiers).
This commit is contained in:
parent
94b59bb144
commit
7569dfe11d
12 changed files with 125 additions and 149 deletions
|
|
@ -2389,20 +2389,10 @@ repeat_next(repeatobject *ro)
|
|||
static PyObject *
|
||||
repeat_repr(repeatobject *ro)
|
||||
{
|
||||
PyObject *result, *objrepr;
|
||||
|
||||
objrepr = PyObject_Repr(ro->element);
|
||||
if (objrepr == NULL)
|
||||
return NULL;
|
||||
|
||||
if (ro->cnt == -1)
|
||||
result = PyUnicode_FromFormat("repeat(%U)",
|
||||
objrepr);
|
||||
return PyUnicode_FromFormat("repeat(%R)", ro->element);
|
||||
else
|
||||
result = PyUnicode_FromFormat("repeat(%U, %zd)",
|
||||
objrepr, ro->cnt);
|
||||
Py_DECREF(objrepr);
|
||||
return result;
|
||||
return PyUnicode_FromFormat("repeat(%R, %zd)", ro->element, ro->cnt);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue