diff options
| -rw-r--r-- | Lib/test/test_bytes.py | 4 | ||||
| -rw-r--r-- | 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 index 966e287..a10ad5e 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 ec03233..701ae9d 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; |