mirror of
https://github.com/python/cpython.git
synced 2025-07-15 23:35:23 +00:00
PyUnicode_FromObject() reuses PyUnicode_Copy()
* PyUnicode_Copy() is faster than substring() * Fix also a compiler warning
This commit is contained in:
parent
9e5bd6c544
commit
2219e0a37e
1 changed files with 2 additions and 4 deletions
|
@ -2052,9 +2052,7 @@ PyUnicode_FromObject(register PyObject *obj)
|
|||
if (PyUnicode_Check(obj)) {
|
||||
/* For a Unicode subtype that's not a Unicode object,
|
||||
return a true Unicode object with the same data. */
|
||||
if (PyUnicode_READY(obj) == -1)
|
||||
return NULL;
|
||||
return substring((PyUnicodeObject *)obj, 0, PyUnicode_GET_LENGTH(obj));
|
||||
return PyUnicode_Copy(obj);
|
||||
}
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"Can't convert '%.100s' object to str implicitly",
|
||||
|
@ -11465,7 +11463,7 @@ unicode_zfill(PyUnicodeObject *self, PyObject *args)
|
|||
return (PyObject*) self;
|
||||
}
|
||||
else
|
||||
return PyUnicode_Copy(self);
|
||||
return PyUnicode_Copy((PyObject*)self);
|
||||
}
|
||||
|
||||
fill = width - _PyUnicode_LENGTH(self);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue