refactore fromhex

Author: jgirardet

tests/snippets/bytes.py

@@ -142,7 +142,8 @@
     bytes.fromhex("6Z2")
 except ValueError as e:
     str(e) == "non-hexadecimal number found in fromhex() arg at position 1"
-
+with assertRaises(TypeError):
+    bytes.fromhex(b'hhjjk')
 # center
 assert [b"koki".center(i, b"|") for i in range(3, 10)] == [
     b"koki",

vm/src/obj/objbyteinner.rs

@@ -342,7 +342,7 @@ impl PyByteInner {
         Ok(vm.ctx.new_str(bla))
     }
 
-    pub fn fromhex(string: String, vm: &VirtualMachine) -> Result<Vec<u8>, PyObjectRef> {
+    pub fn fromhex(string: &str, vm: &VirtualMachine) -> PyResult<Vec<u8>> {
         // first check for invalid character
         for (i, c) in string.char_indices() {
             if !c.is_digit(16) && !c.is_whitespace() {

vm/src/obj/objbytes.rs

@@ -1,4 +1,4 @@
-use crate::obj::objstr::PyString;
+use crate::obj::objstr::PyStringRef;
 use crate::vm::VirtualMachine;
 use core::cell::Cell;
 use std::ops::Deref;
@@ -216,15 +216,8 @@ impl PyBytesRef {
         self.inner.hex(vm)
     }
 
-    // #[pymethod(name = "fromhex")]
-    fn fromhex(string: PyObjectRef, vm: &VirtualMachine) -> PyResult {
-        match_class!(string,
-        s @ PyString => {
-        match PyByteInner::fromhex(s.to_string(), vm) {
-        Ok(x) => Ok(vm.ctx.new_bytes(x)),
-        Err(y) => Err(y)}},
-        obj => Err(vm.new_type_error(format!("fromhex() argument must be str, not {}", obj )))
-        )
+    fn fromhex(string: PyStringRef, vm: &VirtualMachine) -> PyResult {
+        Ok(vm.ctx.new_bytes(PyByteInner::fromhex(string.as_str(), vm)?))
     }
 
     #[pymethod(name = "center")]