Fixed test_bytearray_translate Error (#3730)

Lithium07z · web-flow · commit 53185cdfb8a3 · 2022-05-22T10:57:12.000+09:00
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
@@ -1693,8 +1693,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)
diff --git a/vm/src/bytesinner.rs b/vm/src/bytesinner.rs
@@ -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![],
         };
 
