Fix maketrans not thrown ValueError when length of the arguments are not the same

This commit is contained in:
Narawit Rakket
2021-11-27 12:02:06 +07:00
parent 18427ecc5f
commit cf7c8154bf
4 changed files with 14 additions and 7 deletions

View File

@@ -859,8 +859,6 @@ class BaseBytesTest:
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)

View File

@@ -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]

View File

@@ -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)]

View File

@@ -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 {