Skip to content

Fixed test_bytearray_translate Error #3730

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 3 commits into from
May 22, 2022
Merged

Fixed test_bytearray_translate Error #3730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd7f8a7
Fixed test_bytearray_translate Error
Lithium07z May 21, 2022
ce2ad48
Changing codes
Lithium07z May 22, 2022
c44f088
Apply suggestions from code review
youknowone May 22, 2022
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_builtin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1695,8 +1695,6 @@ def test_bin(self):
self.assertEqual(bin(-(2**65)), '-0b1' + '0' * 65)
self.assertEqual(bin(-(2**65-1)), '-0b' + '1' * 65)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_bytearray_translate(self):
x = bytearray(b"abc")
self.assertRaises(ValueError, x.translate, b"1", 1)
Expand Down
25 changes: 16 additions & 9 deletions vm/src/bytesinner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,27 +202,34 @@ impl ByteInnerPaddingOptions {
#[derive(FromArgs)]
pub struct ByteInnerTranslateOptions {
#[pyarg(positional)]
table: Option<PyBytesInner>,
table: Option<PyObjectRef>,
#[pyarg(any, optional)]
delete: OptionalArg<PyBytesInner>,
delete: OptionalArg<PyObjectRef>,
}

impl ByteInnerTranslateOptions {
pub fn get_value(self, vm: &VirtualMachine) -> PyResult<(Vec<u8>, Vec<u8>)> {
let table = self.table.map_or_else(
|| Ok((0..=255).collect::<Vec<u8>>()),
|v| {
if v.elements.len() != 256 {
return Err(vm.new_value_error(
"translation table must be 256 characters long".to_owned(),
));
}
Ok(v.elements.to_vec())
let bytes = v
.try_into_value::<PyBytesInner>(vm)
.ok()
.filter(|v| v.elements.len() == 256)
.ok_or_else(|| {
vm.new_value_error(
"translation table must be 256 characters long".to_owned(),
)
})?;
Ok(bytes.elements.to_vec())
},
)?;

let delete = match self.delete {
OptionalArg::Present(byte) => byte.elements,
OptionalArg::Present(byte) => {
let byte: PyBytesInner = byte.try_into_value(vm)?;
byte.elements
}
_ => vec![],
};

Expand Down