Skip to content

gh-115754: Use Py_GetConstant(Py_CONSTANT_EMPTY_STR) #125194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Doc/includes/newtypes/custom2.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ Custom_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
CustomObject *self;
self = (CustomObject *) type->tp_alloc(type, 0);
if (self != NULL) {
self->first = PyUnicode_FromString("");
self->first = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (self->first == NULL) {
Py_DECREF(self);
return NULL;
}
self->last = PyUnicode_FromString("");
self->last = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (self->last == NULL) {
Py_DECREF(self);
return NULL;
Expand Down
4 changes: 2 additions & 2 deletions Doc/includes/newtypes/custom3.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ Custom_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
CustomObject *self;
self = (CustomObject *) type->tp_alloc(type, 0);
if (self != NULL) {
self->first = PyUnicode_FromString("");
self->first = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (self->first == NULL) {
Py_DECREF(self);
return NULL;
}
self->last = PyUnicode_FromString("");
self->last = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (self->last == NULL) {
Py_DECREF(self);
return NULL;
Expand Down
4 changes: 2 additions & 2 deletions Doc/includes/newtypes/custom4.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ Custom_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
CustomObject *self;
self = (CustomObject *) type->tp_alloc(type, 0);
if (self != NULL) {
self->first = PyUnicode_FromString("");
self->first = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (self->first == NULL) {
Py_DECREF(self);
return NULL;
}
self->last = PyUnicode_FromString("");
self->last = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (self->last == NULL) {
Py_DECREF(self);
return NULL;
Expand Down
4 changes: 2 additions & 2 deletions Modules/_ctypes/_ctypes.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Modules/_datetimemodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Modules/_elementtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Modules/_functoolsmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion Modules/_io/stringio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Modules/_testcapi/datetime.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions Modules/cjkcodecs/multibytecodec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/socketmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion Modules/unicodedata.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Objects/abstract.c
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ PyObject_Format(PyObject *obj, PyObject *format_spec)

/* If no format_spec is provided, use an empty string */
if (format_spec == NULL) {
empty = PyUnicode_New(0, 0);
empty = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
format_spec = empty;
}

Expand Down
8 changes: 4 additions & 4 deletions Objects/exceptions.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ BaseException_str(PyBaseExceptionObject *self)
{
switch (PyTuple_GET_SIZE(self->args)) {
case 0:
return PyUnicode_FromString("");
return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
case 1:
return PyObject_Str(PyTuple_GET_ITEM(self->args, 0));
default:
Expand Down Expand Up @@ -3001,7 +3001,7 @@ UnicodeEncodeError_str(PyObject *self)

if (exc->object == NULL) {
/* Not properly initialized. */
return PyUnicode_FromString("");
return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}

/* Get reason and encoding as strings, which they might not be if
Expand Down Expand Up @@ -3123,7 +3123,7 @@ UnicodeDecodeError_str(PyObject *self)

if (exc->object == NULL) {
/* Not properly initialized. */
return PyUnicode_FromString("");
return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}

/* Get reason and encoding as strings, which they might not be if
Expand Down Expand Up @@ -3224,7 +3224,7 @@ UnicodeTranslateError_str(PyObject *self)

if (exc->object == NULL) {
/* Not properly initialized. */
return PyUnicode_FromString("");
return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}

/* Get reason as a string, which it might not be if it's been
Expand Down
4 changes: 2 additions & 2 deletions Objects/stringlib/unicode_format.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Py_LOCAL_INLINE(PyObject *)
SubString_new_object_or_empty(SubString *str)
{
if (str->str == NULL) {
return PyUnicode_New(0, 0);
return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}
return SubString_new_object(str);
}
Expand Down Expand Up @@ -531,7 +531,7 @@ render_field(PyObject *fieldobj, SubString *format_spec, _PyUnicodeWriter *write
format_spec->start,
format_spec->end);
else
format_spec_object = PyUnicode_New(0, 0);
format_spec_object = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (format_spec_object == NULL)
goto done;

Expand Down
4 changes: 2 additions & 2 deletions Parser/pegen_errors.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ get_error_line_from_tokenizer_buffers(Parser *p, Py_ssize_t lineno)
assert(p->tok->fp_interactive);
// We can reach this point if the tokenizer buffers for interactive source have not been
// initialized because we failed to decode the original source with the given locale.
return PyUnicode_FromStringAndSize("", 0);
return Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}

Py_ssize_t relative_lineno = p->starting_lineno ? lineno - p->starting_lineno + 1 : lineno;
Expand Down Expand Up @@ -359,7 +359,7 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
error_line = get_error_line_from_tokenizer_buffers(p, lineno);
}
else {
error_line = PyUnicode_FromStringAndSize("", 0);
error_line = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}
if (!error_line) {
goto error;
Expand Down
6 changes: 3 additions & 3 deletions Python/Python-tokenize.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ tokenizeriter_next(tokenizeriterobject *it)
}
PyObject *str = NULL;
if (token.start == NULL || token.end == NULL) {
str = PyUnicode_FromString("");
str = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}
else {
str = PyUnicode_FromStringAndSize(token.start, token.end - token.start);
Expand All @@ -281,7 +281,7 @@ tokenizeriter_next(tokenizeriterobject *it)
PyObject* line = NULL;
int line_changed = 1;
if (it->tok->tok_extra_tokens && is_trailing_token) {
line = PyUnicode_FromString("");
line = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
} else {
Py_ssize_t size = it->tok->inp - line_start;
if (size >= 1 && it->tok->implicit_newline) {
Expand Down Expand Up @@ -326,7 +326,7 @@ tokenizeriter_next(tokenizeriterobject *it)
else if (type == NL) {
if (it->tok->implicit_newline) {
Py_DECREF(str);
str = PyUnicode_FromString("");
str = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Python/ceval.c
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,7 @@ too_many_positional(PyThreadState *tstate, PyCodeObject *co,
}
else {
/* This will not fail. */
kwonly_sig = PyUnicode_FromString("");
kwonly_sig = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
assert(kwonly_sig != NULL);
}
_PyErr_Format(tstate, PyExc_TypeError,
Expand Down
2 changes: 1 addition & 1 deletion Python/codecs.c
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ PyObject *PyCodec_IgnoreErrors(PyObject *exc)
wrong_exception_type(exc);
return NULL;
}
return Py_BuildValue("(Nn)", PyUnicode_New(0, 0), end);
return Py_BuildValue("(Nn)", Py_GetConstant(Py_CONSTANT_EMPTY_STR), end);
}


Expand Down
2 changes: 1 addition & 1 deletion Python/formatter_unicode.c
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ get_locale_info(enum LocaleType type, LocaleInfo *locale_info)
break;
case LT_NO_LOCALE:
locale_info->decimal_point = PyUnicode_FromOrdinal('.');
locale_info->thousands_sep = PyUnicode_New(0, 0);
locale_info->thousands_sep = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
if (!locale_info->decimal_point || !locale_info->thousands_sep)
return -1;
locale_info->grouping = no_grouping;
Expand Down
2 changes: 1 addition & 1 deletion Python/marshal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ r_object(RFILE *p)
v = PyUnicode_DecodeUTF8(buffer, n, "surrogatepass");
}
else {
v = PyUnicode_New(0, 0);
v = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
}
if (v == NULL)
break;
Expand Down
2 changes: 1 addition & 1 deletion Python/symtable.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ static void _dump_symtable(PySTEntryObject* ste, PyObject* prefix)

static void dump_symtable(PySTEntryObject* ste)
{
PyObject *empty = PyUnicode_FromString("");
PyObject *empty = Py_GetConstant(Py_CONSTANT_EMPTY_STR);
assert(empty != NULL);
_dump_symtable(ste, empty);
Py_DECREF(empty);
Expand Down
Loading