Skip to content

Feature/otherdiv #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: feature/floordiv
Choose a base branch
from
Draft

Feature/otherdiv #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions pandas-stubs/core/base.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ from pandas._libs.tslibs.timedeltas import Timedelta
from pandas._typing import (
S1,
S2,
S3,
AxisIndex,
DropKeep,
DTypeLike,
Expand Down Expand Up @@ -322,6 +323,30 @@ class ElementOpsMixin(Generic[S2]):
def _proto_rfloordiv(
self: ElementOpsMixin[Timedelta], other: timedelta | np.timedelta64 | Timedelta
) -> ElementOpsMixin[int]: ...
@overload
def _proto_mod(
self: ElementOpsMixin[int], other: int | np.integer
) -> ElementOpsMixin[int]: ...
@overload
def _proto_mod(
self: ElementOpsMixin[float], other: float | np.floating
) -> ElementOpsMixin[float]: ...
@overload
def _proto_mod(
self: ElementOpsMixin[Timedelta], other: timedelta | np.timedelta64 | Timedelta
) -> ElementOpsMixin[Timedelta]: ...
@overload
def _proto_rmod(
self: ElementOpsMixin[int], other: int | np.integer
) -> ElementOpsMixin[int]: ...
@overload
def _proto_rmod(
self: ElementOpsMixin[float], other: float | np.floating
) -> ElementOpsMixin[float]: ...
@overload
def _proto_rmod(
self: ElementOpsMixin[Timedelta], other: timedelta | np.timedelta64 | Timedelta
) -> ElementOpsMixin[Timedelta]: ...

@type_check_only
class Supports_ProtoAdd(Protocol[_T_contra, S2]):
Expand Down Expand Up @@ -354,3 +379,21 @@ class Supports_ProtoFloorDiv(Protocol[_T_contra, S2]):
@type_check_only
class Supports_ProtoRFloorDiv(Protocol[_T_contra, S2]):
def _proto_rfloordiv(self, other: _T_contra, /) -> ElementOpsMixin[S2]: ...

@type_check_only
class Supports_ProtoMod(Protocol[_T_contra, S2]):
def _proto_mod(self, other: _T_contra, /) -> ElementOpsMixin[S2]: ...

@type_check_only
class Supports_ProtoRMod(Protocol[_T_contra, S2]):
def _proto_rmod(self, other: _T_contra, /) -> ElementOpsMixin[S2]: ...

@type_check_only
class Supports_ProtoDivMod(Protocol[_T_contra, S2, S3]):
def _proto_floordiv(self, other: _T_contra, /) -> ElementOpsMixin[S2]: ...
def _proto_mod(self, other: _T_contra, /) -> ElementOpsMixin[S3]: ...

@type_check_only
class Supports_ProtoRDivMod(Protocol[_T_contra, S2, S3]):
def _proto_rfloordiv(self, other: _T_contra, /) -> ElementOpsMixin[S2]: ...
def _proto_rmod(self, other: _T_contra, /) -> ElementOpsMixin[S3]: ...
17 changes: 7 additions & 10 deletions tests/test_natype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,8 @@ def test_arithmetic() -> None:
# __divmod__
# bug upstream: https://github.com/pandas-dev/pandas/issues/62196
# check(
# assert_type(
# divmod(na, s_int),
# tuple[pd.Series, pd.Series],
# ),
# tuple,
assert_type(divmod(na, s_int), tuple[pd.Series, pd.Series])
# , tuple
# )
# check(
# assert_type(
Expand All @@ -110,13 +107,13 @@ def test_arithmetic() -> None:
# __rdivmod__
# bug upstream: https://github.com/pandas-dev/pandas/issues/62196
# check(
# assert_type(divmod(s_int, na), tuple[pd.Series, pd.Series]),
# tuple,
assert_type(divmod(s_int, na), "tuple[pd.Series[int], pd.Series[int]]")
# , tuple,
# )
# https://github.com/pandas-dev/pandas-stubs/issues/1347
# bug upstream: https://github.com/pandas-dev/pandas/issues/62196
# check(
# assert_type(divmod(idx_int, na), tuple[pd.Index, pd.Index]),
# tuple,
assert_type(divmod(idx_int, na), "tuple[pd.Index[int], pd.Index[int]]")
# , tuple,
# )
check(assert_type(divmod(1, na), tuple[NAType, NAType]), tuple)

Expand Down