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

gh-115754: Use Py_GetConstant(Py_CONSTANT_EMPTY_STR) (#125583) 

Replace PyUnicode_FromStringAndSize(NULL, 0)
with Py_GetConstant(Py_CONSTANT_EMPTY_STR).
This commit is contained in:
Victor Stinner 2024-10-25 11:14:52 +02:00 committed by GitHub
parent db96327203
commit ebcc578dff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/_datetimemodule.c
View File

@ -1766,7 +1766,7 @@ make_Zreplacement(PyObject *object, PyObject *tzinfoarg)
{ {
PyObject *temp; PyObject *temp;
PyObject *tzinfo = get_tzinfo_member(object); PyObject *tzinfo = get_tzinfo_member(object);
PyObject *Zreplacement = PyUnicode_FromStringAndSize(NULL, 0); PyObject *Zreplacement = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (Zreplacement == NULL) if (Zreplacement == NULL)
return NULL; return NULL;

2
Modules/_io/textio.c
View File

@ -1806,7 +1806,7 @@ textiowrapper_get_decoded_chars(textio *self, Py_ssize_t n)
Py_ssize_t avail; Py_ssize_t avail;
if (self->decoded_chars == NULL) if (self->decoded_chars == NULL)
return PyUnicode_FromStringAndSize(NULL, 0); return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
/* decoded_chars is guaranteed to be "ready". */ /* decoded_chars is guaranteed to be "ready". */
avail = (PyUnicode_GET_LENGTH(self->decoded_chars) avail = (PyUnicode_GET_LENGTH(self->decoded_chars)

6
Modules/getpath.c
View File

@ -108,7 +108,7 @@ getpath_dirname(PyObject *Py_UNUSED(self), PyObject *args)
Py_ssize_t end = PyUnicode_GET_LENGTH(path); Py_ssize_t end = PyUnicode_GET_LENGTH(path);
Py_ssize_t pos = PyUnicode_FindChar(path, SEP, 0, end, -1); Py_ssize_t pos = PyUnicode_FindChar(path, SEP, 0, end, -1);
if (pos < 0) { if (pos < 0) {
return PyUnicode_FromStringAndSize(NULL, 0); return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
} }
return PyUnicode_Substring(path, 0, pos); return PyUnicode_Substring(path, 0, pos);
} }
@ -258,7 +258,7 @@ getpath_joinpath(PyObject *Py_UNUSED(self), PyObject *args)
} }
Py_ssize_t n = PyTuple_GET_SIZE(args); Py_ssize_t n = PyTuple_GET_SIZE(args);
if (n == 0) { if (n == 0) {
return PyUnicode_FromStringAndSize(NULL, 0); return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
} }
/* Convert all parts to wchar and accumulate max final length */ /* Convert all parts to wchar and accumulate max final length */
wchar_t **parts = (wchar_t **)PyMem_Malloc(n * sizeof(wchar_t *)); wchar_t **parts = (wchar_t **)PyMem_Malloc(n * sizeof(wchar_t *));
@ -302,7 +302,7 @@ getpath_joinpath(PyObject *Py_UNUSED(self), PyObject *args)
PyErr_NoMemory(); PyErr_NoMemory();
return NULL; return NULL;
} }
return PyUnicode_FromStringAndSize(NULL, 0); return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
} }
final[0] = '\0'; final[0] = '\0';