Fix bytes.split

Author: youknowone

Lib/test/string_tests.py

@@ -360,7 +360,6 @@ def test_expandtabs(self):
             self.checkraises(OverflowError,
                              '\ta\n\tb', 'expandtabs', sys.maxsize)
 
-    @unittest.skip("TODO: RUSTPYTHON test_bytes")
     def test_split(self):
         # by a char
         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'split', '|')
@@ -431,7 +430,6 @@ def test_split(self):
         self.checkraises(ValueError, 'hello', 'split', '')
         self.checkraises(ValueError, 'hello', 'split', '', 0)
 
-    @unittest.skip("TODO: RUSTPYTHON test_bytes")
     def test_rsplit(self):
         # by a char
         self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'rsplit', '|')
@@ -697,8 +695,6 @@ def test_capitalize(self):
 
         self.checkraises(TypeError, 'hello', 'capitalize', 42)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_additional_split(self):
         self.checkequal(['this', 'is', 'the', 'split', 'function'],
             'this is the split function', 'split')
@@ -735,8 +731,6 @@ def test_additional_split(self):
             self.checkequal(['arf', 'barf'], b, 'split', None)
             self.checkequal(['arf', 'barf'], b, 'split', None, 2)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_additional_rsplit(self):
         self.checkequal(['this', 'is', 'the', 'rsplit', 'function'],
                          'this is the rsplit function', 'rsplit')

Lib/test/test_bytes.py

@@ -722,17 +722,13 @@ def test_split_int_error(self):
         self.assertRaises(TypeError, self.type2test(b'a b').split, 32)
         self.assertRaises(TypeError, self.type2test(b'a b').rsplit, 32)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_split_unicodewhitespace(self):
         for b in (b'a\x1Cb', b'a\x1Db', b'a\x1Eb', b'a\x1Fb'):
             b = self.type2test(b)
             self.assertEqual(b.split(), [b])
         b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
         self.assertEqual(b.split(), [b'\x1c\x1d\x1e\x1f'])
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_rsplit_unicodewhitespace(self):
         b = self.type2test(b"\x09\x0A\x0B\x0C\x0D\x1C\x1D\x1E\x1F")
         self.assertEqual(b.rsplit(), [b'\x1c\x1d\x1e\x1f'])

vm/src/obj/objbytearray.rs

@@ -69,8 +69,8 @@ impl PyByteArray {
 }
 
 impl From<Vec<u8>> for PyByteArray {
-    fn from(elements: Vec<u8>) -> PyByteArray {
-        PyByteArray::new(elements)
+    fn from(elements: Vec<u8>) -> Self {
+        Self::new(elements)
     }
 }
 
@@ -389,24 +389,14 @@ impl PyByteArray {
 
     #[pymethod(name = "split")]
     fn split(&self, options: ByteInnerSplitOptions, vm: &VirtualMachine) -> PyResult {
-        let as_bytes = self
-            .borrow_value()
-            .split(options, false)?
-            .iter()
-            .map(|x| vm.ctx.new_bytearray(x.to_vec()))
-            .collect::<Vec<PyObjectRef>>();
-        Ok(vm.ctx.new_list(as_bytes))
+        self.borrow_value()
+            .split(options, |s, vm| vm.ctx.new_bytearray(s.to_vec()), vm)
     }
 
     #[pymethod(name = "rsplit")]
     fn rsplit(&self, options: ByteInnerSplitOptions, vm: &VirtualMachine) -> PyResult {
-        let as_bytes = self
-            .borrow_value()
-            .split(options, true)?
-            .iter()
-            .map(|x| vm.ctx.new_bytearray(x.to_vec()))
-            .collect::<Vec<PyObjectRef>>();
-        Ok(vm.ctx.new_list(as_bytes))
+        self.borrow_value()
+            .rsplit(options, |s, vm| vm.ctx.new_bytearray(s.to_vec()), vm)
     }
 
     #[pymethod(name = "partition")]