fix(comment): without str #1343 (comment)

Author: cmp0xff

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.3
+    rev: v0.12.10
     hooks:
     -   id: ruff-check
         args: [

pandas-stubs/core/series.pyi

@@ -186,7 +186,6 @@ from pandas._typing import (
     np_ndarray_anyint,
     np_ndarray_bool,
     np_ndarray_complex,
-    np_ndarray_dt,
     np_ndarray_float,
     np_ndarray_str,
     np_ndarray_td,
@@ -264,6 +263,16 @@ class _LocIndexerSeries(_LocIndexer, Generic[S1]):
 _ListLike: TypeAlias = (
     ArrayLike | dict[_str, np.ndarray] | Sequence[S1] | IndexOpsMixin[S1]
 )
+_NumListLike: TypeAlias = (
+    ExtensionArray
+    | np_ndarray_bool
+    | np_ndarray_anyint
+    | np_ndarray_float
+    | np_ndarray_complex
+    | dict[_str, np.ndarray]
+    | Sequence[complex]
+    | IndexOpsMixin[complex]
+)
 
 class Series(IndexOpsMixin[S1], NDFrame):
     # Define __index__ because mypy thinks Series follows protocol `SupportsIndex` https://github.com/pandas-dev/pandas-stubs/pull/1332#discussion_r2285648790
@@ -2475,12 +2484,11 @@ class Series(IndexOpsMixin[S1], NDFrame):
     @overload
     def __rxor__(self, other: int | np_ndarray_anyint | Series[int]) -> Series[int]: ...
     @overload
-    def __sub__(
-        self: Series[Never],
-        other: datetime | np.datetime64 | np_ndarray_dt | TimestampSeries,
-    ) -> TimedeltaSeries: ...
+    def __sub__(self: Series[Never], other: TimestampSeries) -> Never: ...
     @overload
-    def __sub__(self: Series[Never], other: complex | _ListLike | Series) -> Series: ...
+    def __sub__(
+        self: Series[Never], other: complex | _NumListLike | Series
+    ) -> Series: ...
     @overload
     def __sub__(self, other: Series[Never]) -> Series: ...  # type: ignore[overload-overlap]
     @overload
@@ -2571,15 +2579,15 @@ class Series(IndexOpsMixin[S1], NDFrame):
     @overload
     def sub(
         self: Series[Never],
-        other: datetime | np.datetime64 | np_ndarray_dt | TimestampSeries,
+        other: TimestampSeries,
         level: Level | None = None,
         fill_value: float | None = None,
         axis: int = 0,
-    ) -> TimedeltaSeries: ...
+    ) -> Never: ...
     @overload
     def sub(
         self: Series[Never],
-        other: complex | _ListLike | Series,
+        other: complex | _NumListLike | Series,
         level: Level | None = None,
         fill_value: float | None = None,
         axis: int = 0,
@@ -2705,9 +2713,10 @@ class Series(IndexOpsMixin[S1], NDFrame):
         axis: int = 0,
     ) -> TimedeltaSeries: ...
     @overload
-    def __rsub__(  # type: ignore[overload-overlap]
-        self: Series[Never],
-        other: complex | datetime | np.datetime64 | _ListLike | Series,
+    def __rsub__(self: Series[Never], other: TimestampSeries) -> Never: ...  # type: ignore[misc]
+    @overload
+    def __rsub__(
+        self: Series[Never], other: complex | _NumListLike | Series
     ) -> Series: ...
     @overload
     def __rsub__(self, other: Series[Never]) -> Series: ...
@@ -2775,13 +2784,17 @@ class Series(IndexOpsMixin[S1], NDFrame):
         ),
     ) -> Series[complex]: ...
     @overload
-    def __rsub__(
-        self: Series[Timestamp], other: datetime | np.datetime64 | np_ndarray_dt
-    ) -> TimedeltaSeries: ...
+    def rsub(
+        self: Series[Never],
+        other: TimestampSeries,
+        level: Level | None = None,
+        fill_value: float | None = None,
+        axis: int = 0,
+    ) -> Never: ...
     @overload
     def rsub(
         self: Series[Never],
-        other: complex | datetime | np.datetime64 | _ListLike | Series,
+        other: complex | _NumListLike | Series,
         level: Level | None = None,
         fill_value: float | None = None,
         axis: int = 0,

tests/series/arithmetic/test_add.py

@@ -5,7 +5,9 @@
 
 from tests import check
 
-left_i = pd.DataFrame({"a": [1, 2, 3]})["a"]  # left operand
+# left operands
+left_i = pd.DataFrame({"a": [1, 2, 3]})["a"]
+left_str = pd.DataFrame({"a": ["1", "2", "3_"]})["a"]
 
 
 def test_add_i_py_scalar() -> None:

tests/series/arithmetic/test_sub.py

@@ -2,24 +2,21 @@
     datetime,
     timedelta,
 )
-from typing import (
-    TYPE_CHECKING,
-    NoReturn,
-)
+from typing import NoReturn
 
 import numpy as np
 from numpy import typing as npt  # noqa: F401
 import pandas as pd
-from typing_extensions import assert_type
+from typing_extensions import (
+    Never,
+    assert_type,
+)
 
 from tests import (
     TYPE_CHECKING_INVALID_USAGE,
     check,
 )
 
-if TYPE_CHECKING:
-    from pandas.core.series import TimedeltaSeries  # noqa: F401
-
 anchor = datetime(2025, 8, 18)
 
 # left operands
@@ -152,76 +149,96 @@ def test_sub_i_pd_series() -> None:
 def test_sub_ts_py_datetime() -> None:
     """Test pd.Series[Any] (Timestamp | Timedelta) - Python native datetime"""
     s = anchor
+    a = [s + timedelta(minutes=m) for m in range(3)]
 
-    check(assert_type(left_ts - s, "TimedeltaSeries"), pd.Series, pd.Timedelta)
+    if TYPE_CHECKING_INVALID_USAGE:
+        _0 = left_ts - s  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        _1 = left_ts - a  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        _2 = left_td - s  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        _3 = left_td - a  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
 
-    check(assert_type(s - left_ts, pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(s - left_td, pd.Series), pd.Series, pd.Timestamp)
+        _4 = s - left_ts  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        _5 = a - left_ts  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        _6 = s - left_td  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        _7 = a - left_td  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
 
-    check(assert_type(left_ts.sub(s), "TimedeltaSeries"), pd.Series, pd.Timedelta)
+        left_ts.sub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_ts.sub(a)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_td.sub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_td.sub(a)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
 
-    check(assert_type(left_ts.rsub(s), pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(left_td.rsub(s), pd.Series), pd.Series, pd.Timestamp)
+        left_ts.rsub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_ts.rsub(a)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_td.rsub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_td.rsub(a)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
 
 
 def test_sub_ts_numpy_datetime() -> None:
     """Test pd.Series[Any] (Timestamp | Timedelta) - numpy datetime(s)"""
     s = np.datetime64(anchor)
     a = np.array([s + np.timedelta64(m, "m") for m in range(3)], np.datetime64)
 
-    check(assert_type(left_ts - s, "TimedeltaSeries"), pd.Series, pd.Timedelta)
-    if TYPE_CHECKING_INVALID_USAGE:
-        _0 = left_td - s
-    check(assert_type(left_ts - a, "TimedeltaSeries"), pd.Series, pd.Timedelta)
     if TYPE_CHECKING_INVALID_USAGE:
-        _1 = left_td - a
+        # `numpy` typing gives the corresponding `ndarray`s in the static type
+        # checking, where our `__rsub__` cannot override.
+        _0 = left_ts - s  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        # _1 = left_ts - a
+        _2 = left_td - s  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        # _3 = left_td - a
 
-    check(assert_type(s - left_ts, pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(s - left_td, pd.Series), pd.Series, pd.Timestamp)
-    # `numpy` typing gives the corresponding `ndarray`s in the static type
-    # checking, where our `__rsub__` cannot override. At runtime, they return
-    # `Series`s.
-    check(assert_type(a - left_ts, "npt.NDArray[np.datetime64]"), pd.Series, pd.Timedelta)  # type: ignore[assert-type]
-    check(assert_type(a - left_td, "npt.NDArray[np.datetime64]"), pd.Series, pd.Timestamp)  # type: ignore[assert-type]
+        _4 = s - left_ts  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        # _5 = a - left_ts
+        _6 = s - left_td  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        # _7 = a - left_td
 
-    check(assert_type(left_ts.sub(s), "TimedeltaSeries"), pd.Series, pd.Timedelta)
-    if TYPE_CHECKING_INVALID_USAGE:
-        left_td.sub(s)
-    check(assert_type(left_ts.sub(a), "TimedeltaSeries"), pd.Series, pd.Timedelta)
-    if TYPE_CHECKING_INVALID_USAGE:
-        left_td.sub(a)
+        left_ts.sub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_ts.sub(a)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_td.sub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_td.sub(a)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
 
-    check(assert_type(left_ts.rsub(s), pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(left_td.rsub(s), pd.Series), pd.Series, pd.Timestamp)
-    check(assert_type(left_ts.rsub(a), pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(left_td.rsub(a), pd.Series), pd.Series, pd.Timestamp)
+        left_ts.rsub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_ts.rsub(a)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_td.rsub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        left_td.rsub(a)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
 
 
 def test_sub_ts_pd_datetime() -> None:
     """Test pd.Series[Any] (Timestamp | Timedelta) - Pandas datetime(s)"""
     s = pd.Timestamp(anchor)
     a = pd.Series([s + pd.Timedelta(minutes=m) for m in range(3)])
 
-    check(assert_type(left_ts - s, "TimedeltaSeries"), pd.Series, pd.Timedelta)
-    if TYPE_CHECKING_INVALID_USAGE:
-        _0 = left_td - s
-    check(assert_type(left_ts - a, "TimedeltaSeries"), pd.Series, pd.Timedelta)
     if TYPE_CHECKING_INVALID_USAGE:
-        _1 = left_td - a
+        _0 = left_ts - s  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        assert_type(left_ts - a, Never)
+        _2 = left_td - s  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        assert_type(left_td - a, Never)
 
-    check(assert_type(s - left_ts, pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(s - left_td, pd.Series), pd.Series, pd.Timestamp)
-    check(assert_type(a - left_ts, pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(a - left_td, pd.Series), pd.Series, pd.Timestamp)
+        _4 = s - left_ts  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        assert_type(a - left_ts, Never)
+        _6 = s - left_td  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        assert_type(a - left_td, Never)
+
+        left_ts.sub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        assert_type(left_ts.sub(a), Never)
+
+
+def test_sub_ts_pd_datetime_1() -> None:
+    """Test pd.Series[Any] (Timestamp | Timedelta) - Pandas datetime(s)"""
+    s = pd.Timestamp(anchor)
+    a = pd.Series([s + pd.Timedelta(minutes=m) for m in range(3)])
 
-    check(assert_type(left_ts.sub(s), "TimedeltaSeries"), pd.Series, pd.Timedelta)
-    if TYPE_CHECKING_INVALID_USAGE:
-        left_td.sub(s)
-    check(assert_type(left_ts.sub(a), "TimedeltaSeries"), pd.Series, pd.Timedelta)
     if TYPE_CHECKING_INVALID_USAGE:
-        left_td.sub(a)
+        # When I merge this one to the previous one, mypy does not allow me to pass
+        left_ts.rsub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        assert_type(left_ts.rsub(a), Never)
 
-    check(assert_type(left_ts.rsub(s), pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(left_td.rsub(s), pd.Series), pd.Series, pd.Timestamp)
-    check(assert_type(left_ts.rsub(a), pd.Series), pd.Series, pd.Timedelta)
-    check(assert_type(left_td.rsub(a), pd.Series), pd.Series, pd.Timestamp)
+
+def test_sub_ts_pd_datetime_2() -> None:
+    """Test pd.Series[Any] (Timestamp | Timedelta) - Pandas datetime(s)"""
+    s = pd.Timestamp(anchor)
+    a = pd.Series([s + pd.Timedelta(minutes=m) for m in range(3)])
+
+    if TYPE_CHECKING_INVALID_USAGE:
+        # When I merge this one to the previous one, mypy does not allow me to pass
+        left_td.rsub(s)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType,reportCallIssue]
+        assert_type(left_td.rsub(a), Never)