From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 15 Apr 2016 15:52:27 +0000 (+0200)
Subject: Issue #26766: Fix _PyBytesWriter_Finish()
X-Git-Tag: v3.6.0a1~204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e914d413128e504f4bb4c46315c9afef104388c9;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 966e287afee4..a10ad5e8932e 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -492,7 +492,7 @@ class BaseBytesTest:
         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 @@ class BaseBytesTest:
         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
index ec03233ba384..701ae9df8a80 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;