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_BYTES) (#125195) 

Replace PyBytes_FromString("") and PyBytes_FromStringAndSize("", 0)
with Py_GetConstant(Py_CONSTANT_EMPTY_BYTES).
This commit is contained in:
Victor Stinner 2024-10-09 17:12:11 +02:00 committed by GitHub
parent 3ee474f568
commit 6a39e96ab8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_ctypes/_ctypes.c
View File

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

2
Modules/_io/textio.c
View File

@ -559,7 +559,7 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self)
Py_DECREF(state); Py_DECREF(state);
} }
else { else {
buffer = PyBytes_FromString(""); buffer = Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
flag = 0; flag = 0;
} }
flag <<= 1; flag <<= 1;

4
Modules/mmapmodule.c
View File

@ -486,7 +486,7 @@ mmap_read_line_method(mmap_object *self,
remaining = (self->pos < self->size) ? self->size - self->pos : 0; remaining = (self->pos < self->size) ? self->size - self->pos : 0;
if (!remaining) if (!remaining)
return PyBytes_FromString(""); return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
start = self->data + self->pos; start = self->data + self->pos;
if (safe_memchr(&eol, start, '\n', remaining) < 0) { if (safe_memchr(&eol, start, '\n', remaining) < 0) {
@ -1274,7 +1274,7 @@ mmap_subscript(mmap_object *self, PyObject *item)
CHECK_VALID(NULL); CHECK_VALID(NULL);
if (slicelen <= 0) if (slicelen <= 0)
return PyBytes_FromStringAndSize("", 0); return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
else if (step == 1) else if (step == 1)
return _safe_PyBytes_FromStringAndSize(self->data + start, slicelen); return _safe_PyBytes_FromStringAndSize(self->data + start, slicelen);
else { else {

4
Modules/zlibmodule.c
View File

@ -267,12 +267,12 @@ newcompobject(PyTypeObject *type)
self->eof = 0; self->eof = 0;
self->is_initialised = 0; self->is_initialised = 0;
self->zdict = NULL; self->zdict = NULL;
self->unused_data = PyBytes_FromStringAndSize("", 0); self->unused_data = Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
if (self->unused_data == NULL) { if (self->unused_data == NULL) {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
} }
self->unconsumed_tail = PyBytes_FromStringAndSize("", 0); self->unconsumed_tail = Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
if (self->unconsumed_tail == NULL) { if (self->unconsumed_tail == NULL) {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;

2
Objects/bytesobject.c
View File

@ -1638,7 +1638,7 @@ bytes_subscript(PyObject *op, PyObject* item)
&stop, step); &stop, step);
if (slicelength <= 0) { if (slicelength <= 0) {
return PyBytes_FromStringAndSize("", 0); return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
} }
else if (start == 0 && step == 1 && else if (start == 0 && step == 1 &&
slicelength == PyBytes_GET_SIZE(self) && slicelength == PyBytes_GET_SIZE(self) &&

2
Parser/action_helpers.c
View File

@ -1541,7 +1541,7 @@ _PyPegen_concatenate_strings(Parser *p, asdl_expr_seq *strings,
} }
if (bytes_found) { 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 /* Bytes literals never get a kind, but just for consistency
since they are represented as Constant nodes, we'll mirror since they are represented as Constant nodes, we'll mirror