mirror of
https://github.com/python/cpython.git
synced 2025-07-23 19:25:40 +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
|
@ -54,7 +54,7 @@ PyErr_SetObject(PyObject *exception, PyObject *value)
|
|||
{
|
||||
if (exception != NULL &&
|
||||
!PyExceptionClass_Check(exception)) {
|
||||
PyObject *excstr = PyObject_Repr(exception);
|
||||
PyObject *excstr = PyObject_ReprStr8(exception);
|
||||
PyErr_Format(PyExc_SystemError,
|
||||
"exception %s not a BaseException subclass",
|
||||
PyString_AS_STRING(excstr));
|
||||
|
|
|
@ -94,7 +94,7 @@ ste_repr(PySTEntryObject *ste)
|
|||
"<symtable entry %.100s(%ld), line %d>",
|
||||
PyString_AS_STRING(ste->ste_name),
|
||||
PyInt_AS_LONG(ste->ste_id), ste->ste_lineno);
|
||||
return PyString_FromString(buf);
|
||||
return PyUnicode_FromString(buf);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue