describe current organization, PR feedback

Author: patrickmckenna

pandas/_libs/ops.pxd

@@ -48,4 +48,3 @@ def maybe_convert_bool(
     *,
     convert_to_masked_nullable: Literal[True],
 ) -> tuple[np.ndarray, np.ndarray]: ...
-def calc_int_int(op, left: int, right: int) -> int: ...

pandas/_libs/ops.pyi

@@ -16,7 +16,6 @@ import numpy as np
 
 from numpy cimport (
     import_array,
-    int64_t,
     ndarray,
     uint8_t,
 )
@@ -309,12 +308,3 @@ def maybe_convert_bool(ndarray[object] arr,
             return (arr, None)
     else:
         return (result.view(np.bool_), None)
-
-
-@cython.overflowcheck(True)
-cpdef int64_t calc_int_int(object op, int64_t a, int64_t b) except? -1:
-    """
-    Calculate op(a, b) and return the result. Raises OverflowError if converting either
-    operand or the result to an int64_t would overflow.
-    """
-    return op(a, b)

pandas/_libs/ops.pyx

@@ -31,8 +31,6 @@ import_datetime()
 
 
 cimport pandas._libs.tslibs.util as util
-from pandas._libs cimport ops
-from pandas._libs.missing cimport C_NA
 from pandas._libs.tslibs.base cimport ABCTimestamp
 from pandas._libs.tslibs.conversion cimport (
     cast_from_unit,
@@ -217,12 +215,11 @@ cpdef int64_t delta_to_nanoseconds(delta) except? -1:
         return get_timedelta64_value(ensure_td64ns(delta))
 
     if PyDelta_Check(delta):
-        microseconds = (
+        return (
             delta.days * 24 * 3600 * 1_000_000
             + delta.seconds * 1_000_000
             + delta.microseconds
-        )
-        return calc_int_int(operator.mul, microseconds, 1000)
+        ) * 1000
 
     raise TypeError(type(delta))
 
@@ -245,14 +242,20 @@ cdef object ensure_td64ns(object ts):
         str unitstr
 
     td64_unit = get_datetime64_unit(ts)
-    if td64_unit in (NPY_DATETIMEUNIT.NPY_FR_ns, NPY_DATETIMEUNIT.NPY_FR_GENERIC):
+    if td64_unit == NPY_DATETIMEUNIT.NPY_FR_ns or td64_unit == NPY_DATETIMEUNIT.NPY_FR_GENERIC:
         return ts
 
     unitstr = npy_unit_to_abbrev(td64_unit)
     mult = precision_from_unit(unitstr)[0]
-    ns = calc_int_int(operator.mul, get_timedelta64_value(ts), mult)
 
-    return np.timedelta64(ns, "ns")
+    with cython.overflowcheck(True):
+        try:
+            td64_value = get_timedelta64_value(ts) * mult
+        except OverflowError as ex:
+            msg = f"{ts} outside allowed range [{TIMEDELTA_MIN_NS}ns, {TIMEDELTA_MAX_NS}ns]"
+            raise OutOfBoundsTimedelta(msg) from ex
+
+    return np.timedelta64(td64_value, "ns")
 
 
 cdef convert_to_timedelta64(object ts, str unit):
@@ -673,18 +676,6 @@ def _op_unary_method(func, name):
     return f
 
 
-cdef int64_t calc_int_int(object op, object a, object b) except? -1:
-    """
-    Calculate op(a, b), raising if either operand or the result cannot be safely cast
-    to an int64_t.
-    """
-    try:
-        return ops.calc_int_int(op, a, b)
-    except OverflowError as ex:
-        msg = f"outside allowed range [{TIMEDELTA_MIN_NS}ns, {TIMEDELTA_MAX_NS}ns]"
-        raise OutOfBoundsTimedelta(msg) from ex
-
-
 def _binary_op_method_timedeltalike(op, name):
     # define a binary operation that only works if the other argument is
     # timedelta like or an array of timedeltalike
@@ -907,8 +898,6 @@ cdef object create_timedelta(object value, str in_unit, NPY_DATETIMEUNIT out_res
 
     if isinstance(value, _Timedelta):
         return value
-    if value is C_NA:
-        raise ValueError("Not supported")
 
     try:
         # if unit == "ns", no need to create an m8[ns] just to read the (same) value back

pandas/_libs/tslibs/timedeltas.pyx

@@ -0,0 +1,10 @@
+import re
+
+import pytest
+
+
+@pytest.fixture(name="td_overflow_msg")
+def fixture_td_overflow_msg() -> str:
+    return re.escape(
+        "outside allowed range [-9223372036854775807ns, 9223372036854775807ns]"
+    )

pandas/tests/libs/test_ops.py

@@ -1,6 +1,9 @@
 """
-Tests for arithmetic ops between a Timedelta scalar and another scalar, or a Timedelta
-scalar and a Array/Index/Series/DataFrame.
+Tests of binary ops between a Timedelta scalar and another scalar or a
+Array/Index/Series/DataFrame.
+
+See test_timedelta.py, in this same directory, for tests against the rest of the public
+Timedelta API.
 """
 
 from __future__ import annotations
@@ -26,6 +29,7 @@
     NaT,
     Timedelta,
     Timestamp,
+    compat,
     offsets,
 )
 import pandas._testing as tm
@@ -115,13 +119,6 @@ def fixture_floor_mod_divmod_op(request):
     return request.param
 
 
-@pytest.fixture(name="td_overflow_msg")
-def fixture_td_overflow_msg() -> str:
-    return re.escape(
-        "outside allowed range [-9223372036854775807ns, 9223372036854775807ns]"
-    )
-
-
 @pytest.fixture(name="invalid_op_msg")
 def fixture_invalid_op_msg() -> str:
     messages = (
@@ -447,7 +444,7 @@ def test_numeric(self, ten_days, mul_op, factor, expected, box_with_array):
         )
         tm.assert_equal(result, expected)
 
-    @pytest.mark.xfail(reason="no overflow check", raises=AssertionError, strict=True)
+    @pytest.mark.xfail(compat.IS64, reason="no overflow check", raises=AssertionError)
     @pytest.mark.parametrize("factor", (1.01, 2), ids=("int", "float"))
     def test_returns_nat_if_result_overflows(self, mul_op, factor, box_with_array):
         numeric_box = tm.box_expected((1, factor), box_with_array, transpose=False)

pandas/tests/scalar/timedelta/conftest.py

@@ -1,6 +1,8 @@
 """
-Most Timedelta scalar tests; See test_arithmetic for tests of binary operations with a
-Timedelta scalar.
+Tests against (most of) the public Timedelta API.
+
+See test_arithmetic.py, in this same directory, for tests of binary ops between a
+Timedelta scalar and another scalar or a Array/Index/Series/DataFrame.
 """
 
 from __future__ import annotations
@@ -12,7 +14,6 @@
     zip_longest,
 )
 import operator
-import re
 
 from hypothesis import (
     given,
@@ -158,13 +159,6 @@ def fixture_td64_min_per_unit(request) -> tuple:
     return unit, TD64_MIN_PER_UNIT[unit]
 
 
-@pytest.fixture(name="td_overflow_msg")
-def fixture_td_overflow_msg() -> str:
-    return re.escape(
-        "outside allowed range [-9223372036854775807ns, 9223372036854775807ns]"
-    )
-
-
 @pytest.fixture(name="non_nano_reso", params=(7, 8, 9))
 def fixture_non_nano_reso(request):
     """7, 8, 9 correspond to second, millisecond, and microsecond, respectively"""

pandas/tests/scalar/timedelta/test_arithmetic.py

@@ -1,3 +1,9 @@
+"""
+Tests against the for-internal-use-only functions in pandas._libs.tslibs.timedeltas.
+
+For tests against the public Timedelta API, see pandas/tests/scalar/timedelta/
+"""
+
 import numpy as np
 import pytest