Merge pull request RustPython#4225 from joohongpark/fix-float-fromhex

Fix class method of a float subclass

Author: youknowone

Lib/test/test_enum.py

@@ -720,8 +720,6 @@ def test_intenum_from_bytes(self):
         with self.assertRaises(ValueError):
             IntStooges.from_bytes(b'\x00\x05', 'big')
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_floatenum_fromhex(self):
         h = float.hex(FloatStooges.MOE.value)
         self.assertIs(FloatStooges.fromhex(h), FloatStooges.MOE)

Lib/test/test_float.py

@@ -1525,8 +1525,6 @@ def roundtrip(x):
             else:
                 self.identical(x, fromHex(toHex(x)))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_subclass(self):
         class F(float):
             def __new__(cls, value):

vm/src/builtins/float.rs

@@ -13,7 +13,7 @@ use crate::{
         PyComparisonValue,
     },
     protocol::{PyNumber, PyNumberMethods},
-    types::{AsNumber, Comparable, Constructor, Hashable, PyComparisonOp},
+    types::{AsNumber, Callable, Comparable, Constructor, Hashable, PyComparisonOp},
     AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult,
     TryFromBorrowedObject, TryFromObject, VirtualMachine,
 };
@@ -480,11 +480,12 @@ impl PyFloat {
         Ok((numer, denom))
     }
 
-    #[pymethod]
-    fn fromhex(repr: PyStrRef, vm: &VirtualMachine) -> PyResult<f64> {
-        float_ops::from_hex(repr.as_str().trim()).ok_or_else(|| {
+    #[pyclassmethod]
+    fn fromhex(cls: PyTypeRef, string: PyStrRef, vm: &VirtualMachine) -> PyResult {
+        let result = float_ops::from_hex(string.as_str().trim()).ok_or_else(|| {
             vm.new_value_error("invalid hexadecimal floating-point string".to_owned())
-        })
+        })?;
+        PyType::call(&cls, vec![vm.ctx.new_float(result).into()].into(), vm)
     }
 
     #[pymethod]