Remove case for int/int while float in use.

python · rhettinger · Jan 7, 2023 · Jan 1, 2023 · Jan 1, 2023 · Jan 2, 2023
commit 90f1ee4b972956a090e270fcdf0b64a7f485fc2b
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
@@ -1279,6 +1279,10 @@ def __rmul__(self, other):
         self.assertTrue(math.isnan(sumprod([10.1, math.inf], [math.nan, 30.3])))
         self.assertTrue(math.isnan(sumprod([10.1, math.inf], [20.3, math.nan])))
 
+        # Error cases that arose during development
+        args = ((-5, -5, 10), (1.5, 4611686018427387904, 2305843009213693952))
+        self.assertEqual(sumprod(*args), 0.0)
+
 
     @requires_IEEE_754
     @unittest.skipIf(HAVE_DOUBLE_ROUNDING,

diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
@@ -3056,20 +3056,6 @@ math_sumprod_impl(PyObject *module, PyObject *p, PyObject *q)
                         PyErr_Clear();
                         goto finalize_flt_path;
                     }
-                } else if (flt_total_in_use && PyLong_CheckExact(p_i) && PyLong_CheckExact(q_i)) {
-                    /* This path makes sure that we don't throw-away a double
-                       length float accumulation if a subsequent int/int pair is
-                       encountered. */
-                    flt_p = PyLong_AsDouble(p_i);
-                    if (flt_p == -1.0 && PyErr_Occurred()) {
-                        PyErr_Clear();
-                        goto finalize_flt_path;
-                    }
-                    flt_q = PyLong_AsDouble(q_i);
-                    if (flt_q == -1.0 && PyErr_Occurred()) {
-                        PyErr_Clear();
-                        goto finalize_flt_path;
-                    }
                 } else {
                     goto finalize_flt_path;
                 }