summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2024-10-09 15:15:23 (GMT)
committerGitHub <noreply@github.com>2024-10-09 15:15:23 (GMT)
commitb9a8ca0a6aa9251cb798f34f0c9d2cc95107eec6 (patch)
tree570ffb9eae19501a3a173fab2dbf56490d1f83db /Modules
parent6a39e96ab8ebc1144f713988ac6fe439e4476488 (diff)
downloadcpython-b9a8ca0a6aa9251cb798f34f0c9d2cc95107eec6.zip
cpython-b9a8ca0a6aa9251cb798f34f0c9d2cc95107eec6.tar.gz
cpython-b9a8ca0a6aa9251cb798f34f0c9d2cc95107eec6.tar.bz2
gh-115754: Use Py_GetConstant(Py_CONSTANT_EMPTY_STR) (#125194)
Replace PyUnicode_New(0, 0), PyUnicode_FromString("") and PyUnicode_FromStringAndSize("", 0) with Py_GetConstant(Py_CONSTANT_EMPTY_STR).
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ctypes/_ctypes.c4
-rw-r--r--Modules/_datetimemodule.c2
-rw-r--r--Modules/_elementtree.c4
-rw-r--r--Modules/_functoolsmodule.c2
-rw-r--r--Modules/_io/stringio.c2
-rw-r--r--Modules/_testcapi/datetime.c2
-rw-r--r--Modules/cjkcodecs/multibytecodec.c4
-rw-r--r--Modules/socketmodule.c2
-rw-r--r--Modules/unicodedata.c2
9 files changed, 12 insertions, 12 deletions
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 9453ed3..8435ee4 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -4756,7 +4756,7 @@ Array_subscript(PyObject *myself, PyObject *item)
wchar_t *dest;
if (slicelen <= 0)
- return PyUnicode_New(0, 0);
+ return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (step == 1) {
return PyUnicode_FromWideChar(ptr + start,
slicelen);
@@ -5438,7 +5438,7 @@ Pointer_subscript(PyObject *myself, PyObject *item)
wchar_t *dest;
if (len <= 0)
- return PyUnicode_New(0, 0);
+ return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (step == 1) {
return PyUnicode_FromWideChar(ptr + start,
len);
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 90527d2..2ba46cd 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -2921,7 +2921,7 @@ delta_bool(PyDateTime_Delta *self)
static PyObject *
delta_repr(PyDateTime_Delta *self)
{
- PyObject *args = PyUnicode_FromString("");
+ PyObject *args = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (args == NULL) {
return NULL;
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index ec99958..e134e09 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -196,7 +196,7 @@ list_join(PyObject* list)
PyObject* joiner;
PyObject* result;
- joiner = PyUnicode_FromStringAndSize("", 0);
+ joiner = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (!joiner)
return NULL;
result = PyUnicode_Join(joiner, list);
@@ -1317,7 +1317,7 @@ _elementtree_Element_findtext_impl(ElementObject *self, PyTypeObject *cls,
PyObject* text = element_get_text((ElementObject*)item);
if (text == Py_None) {
Py_DECREF(item);
- return PyUnicode_New(0, 0);
+ return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}
Py_XINCREF(text);
Py_DECREF(item);
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index 31cf7bc..4ab3adc 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -604,7 +604,7 @@ partial_repr(partialobject *pto)
return PyUnicode_FromString("...");
}
- arglist = PyUnicode_FromString("");
+ arglist = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (arglist == NULL)
goto done;
/* Pack positional arguments */
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index 6d48bcb..f558613 100644
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -353,7 +353,7 @@ _stringio_readline(stringio *self, Py_ssize_t limit)
/* In case of overseek, return the empty string */
if (self->pos >= self->string_size)
- return PyUnicode_New(0, 0);
+ return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
start = self->buf + self->pos;
if (limit < 0 || limit > self->string_size - self->pos)
diff --git a/Modules/_testcapi/datetime.c b/Modules/_testcapi/datetime.c
index f3d5421..b800f9b 100644
--- a/Modules/_testcapi/datetime.c
+++ b/Modules/_testcapi/datetime.c
@@ -129,7 +129,7 @@ static PyObject *
get_timezones_offset_zero(PyObject *self, PyObject *args)
{
PyObject *offset = PyDelta_FromDSU(0, 0, 0);
- PyObject *name = PyUnicode_FromString("");
+ PyObject *name = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (offset == NULL || name == NULL) {
Py_XDECREF(offset);
Py_XDECREF(name);
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 3735186..53135ae 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -669,7 +669,7 @@ _multibytecodec_MultibyteCodec_decode_impl(MultibyteCodecObject *self,
if (datalen == 0) {
ERROR_DECREF(errorcb);
- return make_tuple(PyUnicode_New(0, 0), 0);
+ return make_tuple(Py_GetConstant(Py_CONSTANT_EMPTY_STR), 0);
}
_PyUnicodeWriter_Init(&buf.writer);
@@ -1434,7 +1434,7 @@ mbstreamreader_iread(MultibyteStreamReaderObject *self,
Py_ssize_t rsize;
if (sizehint == 0)
- return PyUnicode_New(0, 0);
+ return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
_PyUnicodeWriter_Init(&buf.writer);
buf.excobj = NULL;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ded6f25..0829d23 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5636,7 +5636,7 @@ socket_gethostname(PyObject *self, PyObject *unused)
return PyErr_SetFromWindowsErr(0);
if (size == 0)
- return PyUnicode_New(0, 0);
+ return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
/* MSDN says ERROR_MORE_DATA may occur because DNS allows longer
names */
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 333ffe6..60bde75 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -413,7 +413,7 @@ unicodedata_UCD_decomposition_impl(PyObject *self, int chr)
if (UCD_Check(self)) {
const change_record *old = get_old_record(self, c);
if (old->category_changed == 0)
- return PyUnicode_FromString(""); /* unassigned */
+ return Py_GetConstant(Py_CONSTANT_EMPTY_STR); /* unassigned */
}
if (code < 0 || code >= 0x110000)