traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use directly unicode_empty instead of PyUnicode_New(0, 0)

This commit is contained in:
Victor Stinner 2011-12-11 21:44:00 +01:00
parent 785938eebd
commit 382955ff4e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Objects/unicodeobject.c
View File

@ -2122,8 +2122,10 @@ PyObject *
PyUnicode_FromWideChar(register const wchar_t *w, Py_ssize_t size) PyUnicode_FromWideChar(register const wchar_t *w, Py_ssize_t size)
{ {
if (w == NULL) { if (w == NULL) {
if (size == 0) if (size == 0) {
return PyUnicode_New(0, 0); Py_INCREF(unicode_empty);
return unicode_empty;
}
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return NULL; return NULL;
} }
@ -4557,7 +4559,8 @@ PyUnicode_DecodeUTF8Stateful(const char *s,
if (size == 0) { if (size == 0) {
if (consumed) if (consumed)
*consumed = 0; *consumed = 0;
return (PyObject *)PyUnicode_New(0, 0); Py_INCREF(unicode_empty);
return unicode_empty;
} }
maxchar = utf8_max_char_size_and_char_count(s, size, &unicode_size); maxchar = utf8_max_char_size_and_char_count(s, size, &unicode_size);
@ -12906,7 +12909,8 @@ unicode_subscript(PyObject* self, PyObject* item)
} }
if (slicelength <= 0) { if (slicelength <= 0) {
return PyUnicode_New(0, 0); Py_INCREF(unicode_empty);
return unicode_empty;
} else if (start == 0 && step == 1 && } else if (start == 0 && step == 1 &&
slicelength == PyUnicode_GET_LENGTH(self) && slicelength == PyUnicode_GET_LENGTH(self) &&
PyUnicode_CheckExact(self)) { PyUnicode_CheckExact(self)) {
@ -13582,8 +13586,10 @@ unicode_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oss:str", if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oss:str",
kwlist, &x, &encoding, &errors)) kwlist, &x, &encoding, &errors))
return NULL; return NULL;
if (x == NULL) if (x == NULL) {
return PyUnicode_New(0, 0); Py_INCREF(unicode_empty);
return unicode_empty;
}
if (encoding == NULL && errors == NULL) if (encoding == NULL && errors == NULL)
return PyObject_Str(x); return PyObject_Str(x);
else else