Skip to content

TYP: resolve mypy errors in core/arrays/_ranges.py #52943

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

Merged
merged 5 commits into from
May 7, 2023
Merged

TYP: resolve mypy errors in core/arrays/_ranges.py #52943

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7719d89
Cast return values to int
jlge Apr 26, 2023
04a39bf
Remove mypy error comment
jlge Apr 28, 2023
46688e2
Add return statement to function
jlge Apr 28, 2023
77ff3ba
Change function signatures
jlge May 7, 2023
79afd7b
Add type annotation to variables
jlge May 7, 2023
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
26 changes: 11 additions & 15 deletions pandas/core/arrays/_ranges.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ def generate_regular_range(
iend = end._value if end is not None else None
freq.nanos # raises if non-fixed frequency
td = Timedelta(freq)
b: int | np.int64 | np.uint64
e: int | np.int64 | np.uint64
try:
td = td.as_unit( # pyright: ignore[reportGeneralTypeIssues]
unit, round_ok=False
Expand Down Expand Up @@ -96,7 +98,7 @@ def generate_regular_range(

def _generate_range_overflow_safe(
endpoint: int, periods: int, stride: int, side: str = "start"
) -> int:
) -> np.int64 | np.uint64:
"""
Calculate the second endpoint for passing to np.arange, checking
to avoid an integer overflow. Catch OverflowError and re-raise
Expand All @@ -115,7 +117,7 @@ def _generate_range_overflow_safe(

Returns
-------
other_end : int
other_end : np.int64 | np.uint64

Raises
------
Expand Down Expand Up @@ -157,13 +159,13 @@ def _generate_range_overflow_safe(
remaining = periods - mid_periods
assert 0 < remaining < periods, (remaining, periods, endpoint, stride)

midpoint = _generate_range_overflow_safe(endpoint, mid_periods, stride, side)
midpoint = int(_generate_range_overflow_safe(endpoint, mid_periods, stride, side))
return _generate_range_overflow_safe(midpoint, remaining, stride, side)


def _generate_range_overflow_safe_signed(
endpoint: int, periods: int, stride: int, side: str
) -> int:
) -> np.int64 | np.uint64:
"""
A special case for _generate_range_overflow_safe where `periods * stride`
can be calculated without overflowing int64 bounds.
Expand All @@ -181,9 +183,7 @@ def _generate_range_overflow_safe_signed(
# Putting this into a DatetimeArray/TimedeltaArray
# would incorrectly be interpreted as NaT
raise OverflowError
# error: Incompatible return value type (got "signedinteger[_64Bit]",
# expected "int")
return result # type: ignore[return-value]
return result
except (FloatingPointError, OverflowError):
# with endpoint negative and addend positive we risk
# FloatingPointError; with reversed signed we risk OverflowError
Expand All @@ -198,15 +198,11 @@ def _generate_range_overflow_safe_signed(
# exceed implementation bounds, but when passing the result to
# np.arange will get a result slightly within the bounds

# error: Incompatible types in assignment (expression has type
# "unsignedinteger[_64Bit]", variable has type "signedinteger[_64Bit]")
result = np.uint64(endpoint) + np.uint64(addend) # type: ignore[assignment]
uresult = np.uint64(endpoint) + np.uint64(addend)
i64max = np.uint64(i8max)
assert result > i64max
if result <= i64max + np.uint64(stride):
# error: Incompatible return value type (got "unsignedinteger", expected
# "int")
return result # type: ignore[return-value]
assert uresult > i64max
if uresult <= i64max + np.uint64(stride):
return uresult

raise OutOfBoundsDatetime(
f"Cannot generate range with {side}={endpoint} and periods={periods}"
Expand Down