Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
61 changes: 40 additions & 21 deletions src/pendulum/duration.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@
from typing_extensions import Self


def _timedelta_parts(td: timedelta) -> tuple[int, int, int]:
"""Read a timedelta's normalized integer fields without going through float."""
return (
timedelta.days.__get__(td, type(td)),
timedelta.seconds.__get__(td, type(td)),
timedelta.microseconds.__get__(td, type(td)),
)


def _signed_duration_parts(total_us: int) -> tuple[int, int, int]:
"""Split a signed microsecond count into days, seconds, microseconds."""
sign = -1 if total_us < 0 else 1
abs_us = abs(total_us)
microseconds = (abs_us % US_PER_SECOND) * sign
total_seconds = abs_us // US_PER_SECOND
seconds = (total_seconds % SECONDS_PER_DAY) * sign
days = (total_seconds // SECONDS_PER_DAY) * sign
return days, seconds, microseconds


def _divide_and_round(a: float, b: float) -> int:
"""divide a by b and round result to the nearest integer

Expand Down Expand Up @@ -94,18 +114,17 @@ def __new__(
weeks,
)

# Intuitive normalization
total = self.total_seconds() - (years * 365 + months * 30) * SECONDS_PER_DAY
self._total = total

m = 1
if total < 0:
m = -1

self._microseconds = round(total % m * 1e6)
self._seconds = abs(int(total)) % SECONDS_PER_DAY * m

_days = abs(int(total)) // SECONDS_PER_DAY * m
# Intuitive normalization. timedelta.total_seconds() is a float and
# drops microseconds on large values, so split from the integer fields.
extra_days = years * 365 + months * 30
td_days, td_seconds, td_microseconds = _timedelta_parts(self)
total_us = (
(td_days - extra_days) * SECONDS_PER_DAY + td_seconds
) * US_PER_SECOND + td_microseconds
self._total = total_us / US_PER_SECOND

m = -1 if total_us < 0 else 1
_days, self._seconds, self._microseconds = _signed_duration_parts(total_us)
self._days = _days
self._remaining_days = abs(_days) % 7 * m
self._weeks = abs(_days) // 7 * m
Expand Down Expand Up @@ -502,18 +521,18 @@ def __new__(
cls, days, seconds, microseconds, milliseconds, minutes, hours, weeks
)

# We need to compute the total_seconds() value
# on a native timedelta object
delta = timedelta(
days, seconds, microseconds, milliseconds, minutes, hours, weeks
)

# Intuitive normalization
self._total = delta.total_seconds()
total = abs(self._total)

self._microseconds = round(total % 1 * 1e6)
days, self._seconds = divmod(int(total), SECONDS_PER_DAY)
td_days, td_seconds, td_microseconds = _timedelta_parts(delta)
total_us = (
td_days * SECONDS_PER_DAY + td_seconds
) * US_PER_SECOND + td_microseconds
self._total = total_us / US_PER_SECOND

abs_us = abs(total_us)
self._microseconds = abs_us % US_PER_SECOND
days, self._seconds = divmod(abs_us // US_PER_SECOND, SECONDS_PER_DAY)
self._days = abs(days + years * 365 + months * 30)
self._weeks, self._remaining_days = divmod(days, 7)
self._months = abs(months)
Expand Down
9 changes: 9 additions & 0 deletions tests/duration/test_construct.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,12 @@ def test_float_years_and_months():

with pytest.raises(ValueError):
pendulum.duration(months=1.5)


def test_large_microseconds_match_timedelta():
us = 8999999999999999
dur = pendulum.duration(microseconds=us)
delta = timedelta(microseconds=us)
assert dur.microseconds == delta.microseconds
assert dur.seconds == delta.seconds
assert dur.days == delta.days