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

Issue #14687: Avoid an useless duplicated string in PyUnicode_Format()

This commit is contained in:
Victor Stinner 2012-04-30 05:21:52 +02:00
parent aff3cc659b
commit b80e46eca4
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Objects/unicodeobject.c
View File

@ -14051,20 +14051,16 @@ PyUnicode_Format(PyObject *format, PyObject *args)
} }
} }
/* Copy all characters, preserving len */ /* Copy all characters, preserving len */
if (temp != NULL) { if (pindex == 0 && len == PyUnicode_GET_LENGTH(temp)) {
assert(pbuf == PyUnicode_DATA(temp)); r = _PyAccu_Accumulate(&acc, temp);
v = PyUnicode_Substring(temp, pindex, pindex + len);
} }
else { else {
const char *p = (const char *) pbuf; v = PyUnicode_Substring(temp, pindex, pindex + len);
assert(pbuf != NULL); if (v == NULL)
p += kind * pindex; goto onError;
v = PyUnicode_FromKindAndData(kind, p, len); r = _PyAccu_Accumulate(&acc, v);
Py_DECREF(v);
} }
if (v == NULL)
goto onError;
r = _PyAccu_Accumulate(&acc, v);
Py_DECREF(v);
if (r) if (r)
goto onError; goto onError;
if (width > len && repeat_accumulate(&acc, blank, width - len)) if (width > len && repeat_accumulate(&acc, blank, width - len))