https://github.com/python/cpython/commit/cdafa05fd5f2838533ce2fb3cfe40c9de27cf63d
commit: cdafa05fd5f2838533ce2fb3cfe40c9de27cf63d
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2025-08-27T10:46:33Z
summary:
[3.13] gh-71679: Improve tests for repr() of bytes and bytearray (GH-138180)
(GH-138183)
* Merge existing tests test_repr_str and test_to_str.
* Add more tests for non-printable and non-ASCII bytes.
* Add tests for special escape sequences ('\t\n\r').
* Add tests for slashes.
* Add more tests for quotes.
* Add tests for subclasses.
* Add test for non-ASCII class name.
* Only apply @check_bytes_warnings for str() tests.
(cherry picked from commit 0dbbf61cc2550428ff99daee367364c688031e1a)
Co-authored-by: Serhiy Storchaka <[email protected]>
files:
M Lib/test/test_bytes.py
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index b8f2a0217685b2..a3dec6bf96b730 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1885,16 +1885,43 @@ class AssortedBytesTest(unittest.TestCase):
# Test various combinations of bytes and bytearray
#
+ def test_bytes_repr(self, f=repr):
+ self.assertEqual(f(b''), "b''")
+ self.assertEqual(f(b"abc"), "b'abc'")
+ self.assertEqual(f(bytes([92])), r"b'\\'")
+ self.assertEqual(f(bytes([0, 1, 254, 255])), r"b'\x00\x01\xfe\xff'")
+ self.assertEqual(f(b'\a\b\t\n\v\f\r'), r"b'\x07\x08\t\n\x0b\x0c\r'")
+ self.assertEqual(f(b'"'), """b'"'""") # '"'
+ self.assertEqual(f(b"'"), '''b"'"''') # "'"
+ self.assertEqual(f(b"'\""), r"""b'\'"'""") # '\'"'
+ self.assertEqual(f(b"\"'\""), r"""b'"\'"'""") # '"\'"'
+ self.assertEqual(f(b"'\"'"), r"""b'\'"\''""") # '\'"\''
+ self.assertEqual(f(BytesSubclass(b"abc")), "b'abc'")
+
+ def test_bytearray_repr(self, f=repr):
+ self.assertEqual(f(bytearray()), "bytearray(b'')")
+ self.assertEqual(f(bytearray(b'abc')), "bytearray(b'abc')")
+ self.assertEqual(f(bytearray([92])), r"bytearray(b'\\')")
+ self.assertEqual(f(bytearray([0, 1, 254, 255])),
+ r"bytearray(b'\x00\x01\xfe\xff')")
+ self.assertEqual(f(bytearray([7, 8, 9, 10, 11, 12, 13])),
+ r"bytearray(b'\x07\x08\t\n\x0b\x0c\r')")
+ self.assertEqual(f(bytearray(b'"')), """bytearray(b'"')""") # '"'
+ self.assertEqual(f(bytearray(b"'")), r'''bytearray(b"\'")''') # "\'"
+ self.assertEqual(f(bytearray(b"'\"")), r"""bytearray(b'\'"')""") #
'\'"'
+ self.assertEqual(f(bytearray(b"\"'\"")), r"""bytearray(b'"\'"')""") #
'"\'"'
+ self.assertEqual(f(bytearray(b'\'"\'')), r"""bytearray(b'\'"\'')""") #
'\'"\''
+ self.assertEqual(f(ByteArraySubclass(b"abc")),
"ByteArraySubclass(b'abc')")
+ self.assertEqual(f(ByteArraySubclass.Nested(b"abc")), "Nested(b'abc')")
+ self.assertEqual(f(ByteArraySubclass.Ŭñıçöđë(b"abc")),
"Ŭñıçöđë(b'abc')")
+
+ @check_bytes_warnings
+ def test_bytes_str(self):
+ self.test_bytes_repr(str)
+
@check_bytes_warnings
- def test_repr_str(self):
- for f in str, repr:
- self.assertEqual(f(bytearray()), "bytearray(b'')")
- self.assertEqual(f(bytearray([0])), "bytearray(b'\\x00')")
- self.assertEqual(f(bytearray([0, 1, 254, 255])),
- "bytearray(b'\\x00\\x01\\xfe\\xff')")
- self.assertEqual(f(b"abc"), "b'abc'")
- self.assertEqual(f(b"'"), '''b"'"''') # '''
- self.assertEqual(f(b"'\""), r"""b'\'"'""") # '
+ def test_bytearray_str(self):
+ self.test_bytearray_repr(str)
@check_bytes_warnings
def test_format(self):
@@ -1947,15 +1974,6 @@ def test_from_bytearray(self):
b = bytearray(buf)
self.assertEqual(b, bytearray(sample))
- @check_bytes_warnings
- def test_to_str(self):
- self.assertEqual(str(b''), "b''")
- self.assertEqual(str(b'x'), "b'x'")
- self.assertEqual(str(b'\x80'), "b'\\x80'")
- self.assertEqual(str(bytearray(b'')), "bytearray(b'')")
- self.assertEqual(str(bytearray(b'x')), "bytearray(b'x')")
- self.assertEqual(str(bytearray(b'\x80')), "bytearray(b'\\x80')")
-
def test_literal(self):
tests = [
(b"Wonderful spam", "Wonderful spam"),
@@ -2163,7 +2181,10 @@ def __init__(me, *args, **kwargs):
class ByteArraySubclass(bytearray):
- pass
+ class Nested(bytearray):
+ pass
+ class Ŭñıçöđë(bytearray):
+ pass
class ByteArraySubclassWithSlots(bytearray):
__slots__ = ('x', 'y', '__dict__')
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
