Match divmod zero-division message with CPython (RustPython#7426)

moreal · web-flow · commit d1ea35962b03 · 2026-03-14T20:21:23.000+09:00
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
@@ -727,7 +727,6 @@ def test___ne__(self):
         self.assertIs(None.__ne__(0), NotImplemented)
         self.assertIs(None.__ne__("abc"), NotImplemented)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON; wrong error message
     def test_divmod(self):
         self.assertEqual(divmod(12, 7), (1, 5))
         self.assertEqual(divmod(-12, 7), (-2, 2))
diff --git a/crates/vm/src/builtins/float.rs b/crates/vm/src/builtins/float.rs
@@ -119,11 +119,11 @@ macro_rules! impl_try_from_object_float {
 impl_try_from_object_float!(f32, f64);
 
 fn inner_div(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<f64> {
-    float_ops::div(v1, v2).ok_or_else(|| vm.new_zero_division_error("float division by zero"))
+    float_ops::div(v1, v2).ok_or_else(|| vm.new_zero_division_error("division by zero"))
 }
 
 fn inner_mod(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<f64> {
-    float_ops::mod_(v1, v2).ok_or_else(|| vm.new_zero_division_error("float mod by zero"))
+    float_ops::mod_(v1, v2).ok_or_else(|| vm.new_zero_division_error("division by zero"))
 }
 
 pub fn try_to_bigint(value: f64, vm: &VirtualMachine) -> PyResult<BigInt> {
@@ -147,11 +147,11 @@ pub fn try_to_bigint(value: f64, vm: &VirtualMachine) -> PyResult<BigInt> {
 }
 
 fn inner_floordiv(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<f64> {
-    float_ops::floordiv(v1, v2).ok_or_else(|| vm.new_zero_division_error("float floordiv by zero"))
+    float_ops::floordiv(v1, v2).ok_or_else(|| vm.new_zero_division_error("division by zero"))
 }
 
 fn inner_divmod(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<(f64, f64)> {
-    float_ops::divmod(v1, v2).ok_or_else(|| vm.new_zero_division_error("float divmod()"))
+    float_ops::divmod(v1, v2).ok_or_else(|| vm.new_zero_division_error("division by zero"))
 }
 
 pub fn float_pow(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult {

Original file line number	Diff line number	Diff line change
`@@ -119,11 +119,11 @@ macro_rules! impl_try_from_object_float {`
`119`	`119`	`impl_try_from_object_float!(f32, f64);`
`120`	`120`
`121`	`121`	`fn inner_div(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<f64> {`
`122`		`- float_ops::div(v1, v2).ok_or_else(\|\| vm.new_zero_division_error("float division by zero"))`
	`122`	`+ float_ops::div(v1, v2).ok_or_else(\|\| vm.new_zero_division_error("division by zero"))`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`fn inner_mod(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<f64> {`
`126`		`- float_ops::mod_(v1, v2).ok_or_else(\|\| vm.new_zero_division_error("float mod by zero"))`
	`126`	`+ float_ops::mod_(v1, v2).ok_or_else(\|\| vm.new_zero_division_error("division by zero"))`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`pub fn try_to_bigint(value: f64, vm: &VirtualMachine) -> PyResult<BigInt> {`
`@@ -147,11 +147,11 @@ pub fn try_to_bigint(value: f64, vm: &VirtualMachine) -> PyResult<BigInt> {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`fn inner_floordiv(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<f64> {`
`150`		`- float_ops::floordiv(v1, v2).ok_or_else(\|\| vm.new_zero_division_error("float floordiv by zero"))`
	`150`	`+ float_ops::floordiv(v1, v2).ok_or_else(\|\| vm.new_zero_division_error("division by zero"))`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`fn inner_divmod(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<(f64, f64)> {`
`154`		`- float_ops::divmod(v1, v2).ok_or_else(\|\| vm.new_zero_division_error("float divmod()"))`
	`154`	`+ float_ops::divmod(v1, v2).ok_or_else(\|\| vm.new_zero_division_error("division by zero"))`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`pub fn float_pow(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult {`