Skip to content

gh-115754: Use Py_GetConstant(Py_CONSTANT_EMPTY_BYTES) #125195

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.

Sign up for GitHub

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 1 commit into from
Oct 9, 2024
Merged

gh-115754: Use Py_GetConstant(Py_CONSTANT_EMPTY_BYTES) #125195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4732,7 +4732,7 @@ Array_subscript(PyObject *myself, PyObject *item)
char *dest;

if (slicelen <= 0)
return PyBytes_FromStringAndSize("", 0);
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
if (step == 1) {
return PyBytes_FromStringAndSize(ptr + start,
slicelen);
Expand Down Expand Up @@ -5418,7 +5418,7 @@ Pointer_subscript(PyObject *myself, PyObject *item)
char *dest;

if (len <= 0)
return PyBytes_FromStringAndSize("", 0);
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
if (step == 1) {
return PyBytes_FromStringAndSize(ptr + start,
len);
Expand Down
2 changes: 1 addition & 1 deletion Modules/_io/textio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self)
Py_DECREF(state);
}
else {
buffer = PyBytes_FromString("");
buffer = Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
flag = 0;
}
flag <<= 1;
Expand Down
4 changes: 2 additions & 2 deletions Modules/mmapmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ mmap_read_line_method(mmap_object *self,

remaining = (self->pos < self->size) ? self->size - self->pos : 0;
if (!remaining)
return PyBytes_FromString("");
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
start = self->data + self->pos;

if (safe_memchr(&eol, start, '\n', remaining) < 0) {
Expand Down Expand Up @@ -1274,7 +1274,7 @@ mmap_subscript(mmap_object *self, PyObject *item)

CHECK_VALID(NULL);
if (slicelen <= 0)
return PyBytes_FromStringAndSize("", 0);
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
else if (step == 1)
return _safe_PyBytes_FromStringAndSize(self->data + start, slicelen);
else {
Expand Down
4 changes: 2 additions & 2 deletions Modules/zlibmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,12 @@ newcompobject(PyTypeObject *type)
self->eof = 0;
self->is_initialised = 0;
self->zdict = NULL;
self->unused_data = PyBytes_FromStringAndSize("", 0);
self->unused_data = Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
if (self->unused_data == NULL) {
Py_DECREF(self);
return NULL;
}
self->unconsumed_tail = PyBytes_FromStringAndSize("", 0);
self->unconsumed_tail = Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
if (self->unconsumed_tail == NULL) {
Py_DECREF(self);
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion Objects/bytesobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@ bytes_subscript(PyObject *op, PyObject* item)
&stop, step);

if (slicelength <= 0) {
return PyBytes_FromStringAndSize("", 0);
return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
}
else if (start == 0 && step == 1 &&
slicelength == PyBytes_GET_SIZE(self) &&
Expand Down
2 changes: 1 addition & 1 deletion Parser/action_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ _PyPegen_concatenate_strings(Parser *p, asdl_expr_seq *strings,
}

if (bytes_found) {
PyObject* res = PyBytes_FromString("");
PyObject* res = Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);

/* Bytes literals never get a kind, but just for consistency
since they are represented as Constant nodes, we'll mirror
Expand Down
Loading