[Python-checkins] cpython: Issue #26766: Fix _PyBytesWriter_Finish()

Fri Apr 15 11:52:46 EDT 2016

https://hg.python.org/cpython/rev/1eb586d5b321
changeset: 100985:1eb586d5b321
user: Victor Stinner <victor.stinner at gmail.com>
date: Fri Apr 15 17:52:27 2016 +0200
summary:
 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.
files:
 Lib/test/test_bytes.py | 4 ++--
 Objects/bytesobject.c | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -492,7 +492,7 @@
 b = self.type2test(b'%s / 100 = %d%%')
 a = b % (b'seventy-nine', 79)
 self.assertEqual(a, b'seventy-nine / 100 = 79%')
- self.assertIs(type(a), bytes)
+ self.assertIs(type(a), self.type2test)
 
 def test_imod(self):
 b = self.type2test(b'hello, %b!')
@@ -504,7 +504,7 @@
 b = self.type2test(b'%s / 100 = %d%%')
 b %= (b'seventy-nine', 79)
 self.assertEqual(b, b'seventy-nine / 100 = 79%')
- self.assertIs(type(b), bytes)
+ self.assertIs(type(b), self.type2test)
 
 def test_rmod(self):
 with self.assertRaises(TypeError):
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -4150,7 +4150,12 @@
 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;
-- 
Repository URL: https://hg.python.org/cpython
