mirrors/RustPython
0
0 Fork 0
mirror of https://github.com/RustPython/RustPython.git synced 2026-10-28 18:59:04 +08:00
Code Activity

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

Browse Source
This commit is contained in:
Lee Dogeon authored and GitHub committed 2026-03-14 20:21:23 +09:00
1 parent e9ba43935e
commit 3f1ce34422
2 files changed
+4 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Lib/test/test_builtin.py
Vendored
-1
View File
@@ -727,7 +727,6 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase):
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))
crates/vm/src/builtins/float.rs
+4 -4
View File
@@ -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 {