mirror of
https://github.com/python/cpython.git
synced 2025-08-25 11:15:02 +00:00
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.
This commit is contained in:
parent
14176a56d3
commit
1ab8330827
49 changed files with 385 additions and 255 deletions
|
@ -1574,7 +1574,7 @@ array_repr(arrayobject *a)
|
|||
typecode = a->ob_descr->typecode;
|
||||
if (len == 0) {
|
||||
PyOS_snprintf(buf, sizeof(buf), "array('%c')", typecode);
|
||||
return PyString_FromString(buf);
|
||||
return PyUnicode_FromString(buf);
|
||||
}
|
||||
|
||||
if (typecode == 'c')
|
||||
|
@ -1587,9 +1587,9 @@ array_repr(arrayobject *a)
|
|||
Py_XDECREF(v);
|
||||
|
||||
PyOS_snprintf(buf, sizeof(buf), "array('%c', ", typecode);
|
||||
s = PyString_FromString(buf);
|
||||
PyString_ConcatAndDel(&s, t);
|
||||
PyString_ConcatAndDel(&s, PyString_FromString(")"));
|
||||
s = PyUnicode_FromString(buf);
|
||||
PyUnicode_AppendAndDel(&s, t);
|
||||
PyUnicode_AppendAndDel(&s, PyUnicode_FromString(")"));
|
||||
return s;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue