memoryview hex

qingshi163 · coolreader18 · commit 2ed49bc51eaf · 2020-10-07T19:51:16.000-05:00
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -416,8 +416,6 @@ def test_fromhex(self):
                 self.type2test.fromhex(data)
             self.assertIn('at position %s' % pos, str(cm.exception))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_hex(self):
         self.assertRaises(TypeError, self.type2test.hex)
         self.assertRaises(TypeError, self.type2test.hex, 1)
diff --git a/Lib/test/test_memoryview.py b/Lib/test/test_memoryview.py
@@ -544,8 +544,6 @@ def test_ctypes_cast(self):
                 m[2:] = memoryview(p6).cast(format)[2:]
                 self.assertEqual(d.value, 0.6)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_memoryview_hex(self):
         # Issue #9951: memoryview.hex() segfaults with non-contiguous buffers.
         x = b'0' * 200000
diff --git a/vm/src/obj/objbytes.rs b/vm/src/obj/objbytes.rs
@@ -222,8 +222,10 @@ impl PyBytes {
         self.inner.swapcase().into()
     }
 
+    // TODO: Changed in version 3.8: bytes.hex() now supports optional sep and
+    // bytes_per_sep parameters to insert separators between bytes in the hex output.
     #[pymethod(name = "hex")]
-    fn hex(&self) -> String {
+    pub(crate) fn hex(&self) -> String {
         self.inner.hex()
     }
 
diff --git a/vm/src/obj/objmemory.rs b/vm/src/obj/objmemory.rs
@@ -603,6 +603,30 @@ impl PyMemoryView {
         }
     }
 
+    // TODO: Changed in version 3.8: memoryview.hex() now supports optional sep and bytes_per_sep
+    // parameters to insert separators between bytes in the hex output.
+    #[pymethod]
+    fn hex(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult<String> {
+        zelf.try_not_released(vm)?;
+        let guard;
+        let vec;
+        let bytes = match zelf.as_contiguous() {
+            Some(bytes) => {
+                guard = bytes;
+                &*guard
+            }
+            None => {
+                vec = zelf.to_contiguous();
+                vec.as_slice()
+            }
+        };
+        let s = bytes
+            .iter()
+            .map(|x| format!("{:02x}", x))
+            .collect::<String>();
+        Ok(s)
+    }
+
     fn eq(zelf: &PyRef<Self>, other: &PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
         if zelf.is(other) {
             return Ok(true);
@@ -686,7 +710,8 @@ impl Buffer for PyMemoryViewRef {
     }
 
     fn is_resizable(&self) -> bool {
-        self.buffer.is_resizable()
+        // memoryview cannot resize
+        false
     }
 
     fn as_contiguous(&self) -> Option<BorrowedValue<[u8]>> {

Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,10 @@ impl PyBytes {`
`222`	`222`	`self.inner.swapcase().into()`
`223`	`223`	`}`
`224`	`224`
	`225`	`+ // TODO: Changed in version 3.8: bytes.hex() now supports optional sep and`
	`226`	`+ // bytes_per_sep parameters to insert separators between bytes in the hex output.`
`225`	`227`	`#[pymethod(name = "hex")]`
`226`		`- fn hex(&self) -> String {`
	`228`	`+ pub(crate) fn hex(&self) -> String {`
`227`	`229`	`self.inner.hex()`
`228`	`230`	`}`
`229`	`231`