mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Writer APIs: use empty string singletons

Browse source 
Modify _PyBytesWriter_Finish() and _PyUnicodeWriter_Finish() to return the
empty bytes/Unicode string if the string is empty.
This commit is contained in:
Victor Stinner 2015-10-12 13:29:43 +02:00
parent c29e29bed1
commit 6c2cdae9e6
2 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Objects/bytesobject.c
View file

@ -4019,19 +4019,24 @@ _PyBytesWriter_Finish(_PyBytesWriter *writer, void *str)
_PyBytesWriter_CheckConsistency(writer, str);
pos = _PyBytesWriter_GetPos(writer, str);
if (!writer->use_small_buffer) {
if (pos == 0) {
Py_CLEAR(writer->buffer);
/* Get the empty byte string singleton */
result = PyBytes_FromStringAndSize(NULL, 0);
}
else if (writer->use_small_buffer) {
result = PyBytes_FromStringAndSize(writer->small_buffer, pos);
}
else {
result = writer->buffer;
writer->buffer = NULL;
if (pos != writer->allocated) {
if (_PyBytes_Resize(&writer->buffer, pos)) {
assert(writer->buffer == NULL);
if (_PyBytes_Resize(&result, pos)) {
assert(result == NULL);
return NULL;
}
}
result = writer->buffer;
writer->buffer = NULL;
}
else {
result = PyBytes_FromStringAndSize(writer->small_buffer, pos);
}
return result;
}