Skip to content

Preserve fractional timedelta seconds until formatting #1401

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

Open
nawaaaaaAaar wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −1
Open

Preserve fractional timedelta seconds until formatting #1401

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
2 changes: 1 addition & 1 deletion babel/dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ def format_timedelta(
)
format = 'long'
if isinstance(delta, datetime.timedelta):
seconds = int((delta.days * 86400) + delta.seconds)
seconds = delta.total_seconds()
else:
seconds = delta
locale = Locale.parse(locale or LC_TIME)
Expand Down
30 changes: 30 additions & 0 deletions tests/test_dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,36 @@ def test_format_timedelta_zero_seconds():
assert dates.format_timedelta(td, granularity='hour', locale='en', format='short') == '0 hr' # fmt: skip


@pytest.mark.parametrize(('microseconds', 'count'), [
(1, 1),
(500_000, 1),
(1_499_999, 1),
(1_500_001, 2),
(2_499_999, 2),
(2_500_001, 3),
(50_999_999, 51),
])
@pytest.mark.parametrize('sign', [-1, 1])
@pytest.mark.parametrize('add_direction', [False, True])
def test_format_timedelta_fractional_seconds(microseconds, count, sign, add_direction):
expected = f'{count} second' + ('s' if count != 1 else '')
if add_direction:
expected = f'in {expected}' if sign > 0 else f'{expected} ago'
assert dates.format_timedelta(
timedelta(microseconds=sign * microseconds),
locale='en',
add_direction=add_direction,
) == expected


@pytest.mark.parametrize('seconds', [0, -1, 1, -50, 50, -86400, 86400, 86_399_999_999_999])
@pytest.mark.parametrize('add_direction', [False, True])
def test_format_timedelta_integral_seconds_match_integer(seconds, add_direction):
assert dates.format_timedelta(
timedelta(seconds=seconds), locale='en', add_direction=add_direction,
) == dates.format_timedelta(seconds, locale='en', add_direction=add_direction)


def test_format_timedelta_small_value_with_granularity():
td = timedelta(seconds=42)
assert dates.format_timedelta(td, granularity='hour', locale='en') == '1 hour'
Expand Down