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

Change the %s format specifier for str objects so that it returns a

Browse source 
unicode instance if the argument is not an instance of basestring and
calling __str__ on the argument returns a unicode instance.
This commit is contained in:
Neil Schemenauer 2005-08-12 17:34:58 +00:00
parent ba7d95e215
commit cf52c07843
5 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Objects/object.c
View file

@ -331,22 +331,48 @@ PyObject_Repr(PyObject *v)
}
PyObject *
PyObject_Str(PyObject *v)
_PyObject_Str(PyObject *v)
{
PyObject *res;
int type_ok;
if (v == NULL)
return PyString_FromString("<NULL>");
if (PyString_CheckExact(v)) {
Py_INCREF(v);
return v;
}
#ifdef Py_USING_UNICODE
if (PyUnicode_CheckExact(v)) {
Py_INCREF(v);
return v;
}
#endif
if (v->ob_type->tp_str == NULL)
return PyObject_Repr(v);
res = (*v->ob_type->tp_str)(v);
if (res == NULL)
return NULL;
type_ok = PyString_Check(res);
#ifdef Py_USING_UNICODE
type_ok = type_ok || PyUnicode_Check(res);
#endif
if (!type_ok) {
PyErr_Format(PyExc_TypeError,
"__str__ returned non-string (type %.200s)",
res->ob_type->tp_name);
Py_DECREF(res);
return NULL;
}
return res;
}
PyObject *
PyObject_Str(PyObject *v)
{
PyObject *res = _PyObject_Str(v);
if (res == NULL)
return NULL;
#ifdef Py_USING_UNICODE
if (PyUnicode_Check(res)) {
PyObject* str;
@ -358,13 +384,7 @@ PyObject_Str(PyObject *v)
return NULL;
}
#endif
if (!PyString_Check(res)) {
PyErr_Format(PyExc_TypeError,
"__str__ returned non-string (type %.200s)",
res->ob_type->tp_name);
Py_DECREF(res);
return NULL;
}
assert(PyString_Check(res));
return res;
}