Merge pull request #2318 from qingshi163/bytes-format

coolreader18 · web-flow · commit 0b9beeba6f9c · 2020-11-06T15:48:37.000-06:00
Reimpl cformat to suit for bytes
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -639,8 +639,6 @@ def test_rindex(self):
         self.assertEqual(b.rindex(i, 3, 9), 7)
         self.assertRaises(ValueError, b.rindex, w, 1, 3)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_mod(self):
         b = self.type2test(b'hello, %b!')
         orig = b
@@ -658,8 +656,6 @@ def test_mod(self):
         self.assertEqual(b, b'hello,\x00world!')
         self.assertIs(type(b), self.type2test)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_imod(self):
         b = self.type2test(b'hello, %b!')
         orig = b
diff --git a/vm/src/builtins/bytearray.rs b/vm/src/builtins/bytearray.rs
@@ -608,7 +608,7 @@ impl PyByteArray {
     #[pymethod(name = "__mod__")]
     fn modulo(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyByteArray> {
         let formatted = self.borrow_value().cformat(values, vm)?;
-        Ok(formatted.into_bytes().into())
+        Ok(formatted.into())
     }
 
     #[pymethod(name = "__rmod__")]
diff --git a/vm/src/builtins/bytes.rs b/vm/src/builtins/bytes.rs
@@ -441,9 +441,9 @@ impl PyBytes {
     }
 
     #[pymethod(name = "__mod__")]
-    fn modulo(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult {
+    fn modulo(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyBytes> {
         let formatted = self.inner.cformat(values, vm)?;
-        Ok(vm.ctx.new_bytes(formatted.into_bytes()))
+        Ok(formatted.into())
     }
 
     #[pymethod(name = "__rmod__")]
diff --git a/vm/src/bytesinner.rs b/vm/src/bytesinner.rs
@@ -11,6 +11,7 @@ use crate::builtins::pystr::{self, PyStr, PyStrRef};
 use crate::builtins::singletons::PyNoneRef;
 use crate::builtins::PyTypeRef;
 use crate::byteslike::try_bytes_like;
+use crate::cformat::CFormatBytes;
 use crate::function::{OptionalArg, OptionalOption};
 use crate::pyobject::{
     BorrowValue, Either, IdProtocol, PyComparisonValue, PyIterable, PyObjectRef, PyRef, PyResult,
@@ -894,8 +895,10 @@ impl PyBytesInner {
         res
     }
 
-    pub fn cformat(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<String> {
-        self.elements.py_cformat(values, vm)
+    pub fn cformat(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<Vec<u8>> {
+        CFormatBytes::parse_from_bytes(self.elements.as_slice())
+            .map_err(|err| vm.new_value_error(err.to_string()))?
+            .format(vm, values)
     }
 
     pub fn repeat(&self, n: isize) -> Vec<u8> {
diff --git a/vm/src/cformat.rs b/vm/src/cformat.rs

Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ impl PyByteArray {`
`608`	`608`	`#[pymethod(name = "__mod__")]`
`609`	`609`	`fn modulo(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyByteArray> {`
`610`	`610`	`let formatted = self.borrow_value().cformat(values, vm)?;`
`611`		`- Ok(formatted.into_bytes().into())`
	`611`	`+ Ok(formatted.into())`
`612`	`612`	`}`
`613`	`613`
`614`	`614`	`#[pymethod(name = "__rmod__")]`
Original file line number	Diff line number	Diff line change
`@@ -441,9 +441,9 @@ impl PyBytes {`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`#[pymethod(name = "__mod__")]`
`444`		`- fn modulo(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
	`444`	`+ fn modulo(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyBytes> {`
`445`	`445`	`let formatted = self.inner.cformat(values, vm)?;`
`446`		`- Ok(vm.ctx.new_bytes(formatted.into_bytes()))`
	`446`	`+ Ok(formatted.into())`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`#[pymethod(name = "__rmod__")]`