summaryrefslogtreecommitdiff
path: root/Objects/bytesobject.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-04-15 17:52:27 +0200
committerVictor Stinner <victor.stinner@gmail.com>2016-04-15 17:52:27 +0200
commit5de58df631084e72d9a9e05f231fbcba448c38bd (patch)
treec0b26eda77c76ce90672a0f6362f32d016205f51 /Objects/bytesobject.c
parentfe598ee562c4d7834bb829abc7bf1f7da7d4e6e3 (diff)
downloadcpython-5de58df631084e72d9a9e05f231fbcba448c38bd.tar.gz
Issue #26766: Fix _PyBytesWriter_Finish()
Return a bytearray object when bytearray is requested and when the small buffer is used. Fix also test_bytes: bytearray%args must return a bytearray type.
Diffstat (limited to 'Objects/bytesobject.c')
-rw-r--r--Objects/bytesobject.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index ec03233ba3..701ae9df8a 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -4150,7 +4150,12 @@ _PyBytesWriter_Finish(_PyBytesWriter *writer, void *str)
result = PyBytes_FromStringAndSize(NULL, 0);
}
else if (writer->use_small_buffer) {
- result = PyBytes_FromStringAndSize(writer->small_buffer, size);
+ if (writer->use_bytearray) {
+ result = PyByteArray_FromStringAndSize(writer->small_buffer, size);
+ }
+ else {
+ result = PyBytes_FromStringAndSize(writer->small_buffer, size);
+ }
}
else {
result = writer->buffer;