Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Port 60893 to py3k, without unicode test.

This commit is contained in:
Eric Smith 2008-02-18 18:07:47 +00:00
parent 537a6258ad
commit 8a0217cd86
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Objects/stringlib/string_format.h
View File

@ -493,6 +493,22 @@ render_field(PyObject *fieldobj, SubString *format_spec, OutputString *output)
if (result == NULL)
goto done;
#if PY_VERSION_HEX >= 0x03000000
assert(PyString_Check(result));
#else
assert(PyString_Check(result) || PyUnicode_Check(result));
/* Convert result to our type. We could be str, and result could
be unicode */
{
PyObject *tmp = STRINGLIB_TOSTR(result);
if (tmp == NULL)
goto done;
Py_DECREF(result);
result = tmp;
}
#endif
ok = output_data(output,
STRINGLIB_STR(result), STRINGLIB_LEN(result));
done: