Merge pull request #3459 from TeamTamoad/maketrans

youknowone · web-flow · commit e2b5abf70cf9 · 2021-11-27T15:05:48.000+09:00
Fix maketrans not thrown ValueError when length of the arguments are …
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -859,8 +859,6 @@ def test_ord(self):
         self.assertEqual([ord(b[i:i+1]) for i in range(len(b))],
                          [0, 65, 127, 128, 255])
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_maketrans(self):
         transtable = b'\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'
         self.assertEqual(self.type2test.maketrans(b'abc', b'xyz'), transtable)
diff --git a/vm/src/builtins/bytearray.rs b/vm/src/builtins/bytearray.rs
@@ -228,8 +228,8 @@ impl PyByteArray {
     }
 
     #[pymethod]
-    fn maketrans(from: PyBytesInner, to: PyBytesInner) -> PyResult<Vec<u8>> {
-        PyBytesInner::maketrans(from, to)
+    fn maketrans(from: PyBytesInner, to: PyBytesInner, vm: &VirtualMachine) -> PyResult<Vec<u8>> {
+        PyBytesInner::maketrans(from, to, vm)
     }
 
     #[pymethod]
diff --git a/vm/src/builtins/bytes.rs b/vm/src/builtins/bytes.rs
@@ -150,8 +150,8 @@ impl PyBytes {
     }
 
     #[pymethod]
-    fn maketrans(from: PyBytesInner, to: PyBytesInner) -> PyResult<Vec<u8>> {
-        PyBytesInner::maketrans(from, to)
+    fn maketrans(from: PyBytesInner, to: PyBytesInner, vm: &VirtualMachine) -> PyResult<Vec<u8>> {
+        PyBytesInner::maketrans(from, to, vm)
     }
 
     #[pymethod(magic)]
diff --git a/vm/src/bytesinner.rs b/vm/src/bytesinner.rs
@@ -525,7 +525,16 @@ impl PyBytesInner {
         Ok(self.elements.py_find(&needle, range, find))
     }
 
-    pub fn maketrans(from: PyBytesInner, to: PyBytesInner) -> PyResult<Vec<u8>> {
+    pub fn maketrans(
+        from: PyBytesInner,
+        to: PyBytesInner,
+        vm: &VirtualMachine,
+    ) -> PyResult<Vec<u8>> {
+        if from.len() != to.len() {
+            return Err(
+                vm.new_value_error("the two maketrans arguments must have equal length".to_owned())
+            );
+        }
         let mut res = vec![];
 
         for i in 0..=255 {

Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,8 @@ impl PyByteArray {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`#[pymethod]`
`231`		`- fn maketrans(from: PyBytesInner, to: PyBytesInner) -> PyResult<Vec<u8>> {`
`232`		`- PyBytesInner::maketrans(from, to)`
	`231`	`+ fn maketrans(from: PyBytesInner, to: PyBytesInner, vm: &VirtualMachine) -> PyResult<Vec<u8>> {`
	`232`	`+ PyBytesInner::maketrans(from, to, vm)`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`#[pymethod]`
Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,8 @@ impl PyBytes {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`#[pymethod]`
`153`		`- fn maketrans(from: PyBytesInner, to: PyBytesInner) -> PyResult<Vec<u8>> {`
`154`		`- PyBytesInner::maketrans(from, to)`
	`153`	`+ fn maketrans(from: PyBytesInner, to: PyBytesInner, vm: &VirtualMachine) -> PyResult<Vec<u8>> {`
	`154`	`+ PyBytesInner::maketrans(from, to, vm)`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`#[pymethod(magic)]`