Skip to content

Fix bytearray repr escaping for apostrophes #8316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Jul 22, 2026
Merged

Fix bytearray repr escaping for apostrophes #8316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb9aaa1
Fix bytearray repr escaping for apostrophes
cuishuang Jul 18, 2026
e6a766e
Fix bytearray repr escaping for apostrophes
cuishuang Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Lib/test/test_bytes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,6 @@ def test_bytes_repr(self, f=repr):
self.assertEqual(f(b"'\"'"), r"""b'\'"\''""") # '\'"\''
self.assertEqual(f(BytesSubclass(b"abc")), "b'abc'")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_bytearray_repr(self, f=repr):
self.assertEqual(f(bytearray()), "bytearray(b'')")
self.assertEqual(f(bytearray(b'abc')), "bytearray(b'abc')")
Expand All @@ -2124,7 +2123,6 @@ def test_bytearray_repr(self, f=repr):
def test_bytes_str(self):
self.test_bytes_repr(str)

@unittest.expectedFailure # TODO: RUSTPYTHON
@check_bytes_warnings
def test_bytearray_str(self):
self.test_bytearray_repr(str)
Expand Down
57 changes: 49 additions & 8 deletions crates/vm/src/bytes_inner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,31 @@ impl ByteInnerTranslateOptions {

pub(crate) type ByteInnerSplitOptions = anystr::SplitArgs<PyBytesInner>;

fn bytearray_repr_char_len(ch: u8) -> usize {
match ch {
b'\'' | b'\\' | b'\t' | b'\r' | b'\n' => 2,
0x20..=0x7e => 1,
_ => 4, // \xHH
}
}

fn write_bytearray_repr_char(ch: u8, buf: &mut String) {
match ch {
b'\'' => buf.push_str(r#"\'"#),
b'\\' => buf.push_str(r#"\\"#),
b'\t' => buf.push_str(r#"\t"#),
b'\n' => buf.push_str(r#"\n"#),
b'\r' => buf.push_str(r#"\r"#),
0x20..=0x7e => buf.push(ch as char),
ch => {
const HEX: &[u8; 16] = b"0123456789abcdef";
buf.push_str(r#"\x"#);
buf.push(HEX[(ch >> 4) as usize] as char);
buf.push(HEX[(ch & 0x0f) as usize] as char);
}
}
}

Comment thread
coderabbitai[bot] marked this conversation as resolved.
impl PyBytesInner {
#[inline]
pub fn as_bytes(&self) -> &[u8] {
Expand All @@ -251,17 +276,33 @@ impl PyBytesInner {
}

pub fn repr_with_name(&self, class_name: &str, vm: &VirtualMachine) -> PyResult<String> {
const DECORATION_LEN: isize = 2 + 3; // 2 for (), 3 for b"" => bytearray(b"")
let escape = crate::literal::escape::AsciiEscape::new_repr(&self.elements);
let len = escape
.layout()
.len
.and_then(|len| (len as isize).checked_add(DECORATION_LEN + class_name.len() as isize))
.ok_or_else(|| Self::new_repr_overflow_error(vm))? as usize;
const DECORATION_LEN: usize = 2 + 3; // 2 for (), 3 for b"" => bytearray(b"")
let quote = if self.elements.contains(&b'\'') && !self.elements.contains(&b'"') {
'"'
} else {
'\''
};
let body_len = self
.elements
.iter()
.try_fold(0usize, |len, &ch| {
len.checked_add(bytearray_repr_char_len(ch))
})
.ok_or_else(|| Self::new_repr_overflow_error(vm))?;
let len = class_name
.len()
.checked_add(DECORATION_LEN)
.and_then(|len| len.checked_add(body_len))
.ok_or_else(|| Self::new_repr_overflow_error(vm))?;
let mut buf = String::with_capacity(len);
buf.push_str(class_name);
buf.push('(');
escape.bytes_repr().write(&mut buf).unwrap();
buf.push('b');
buf.push(quote);
for &ch in &self.elements {
write_bytearray_repr_char(ch, &mut buf);
}
buf.push(quote);
buf.push(')');
debug_assert_eq!(buf.len(), len);
Ok(buf)
Expand Down
Loading