Skip to content

Accumulate repeated units in parse_timedelta #583

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
shreyans-chowdry wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Accumulate repeated units in parse_timedelta #583

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
7 changes: 6 additions & 1 deletion boltons/timeutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@ def parse_timedelta(text):
>>> parse_td('2 weeks 1 day') == timedelta(days=15)
True

Repeated units are added together:

>>> parse_td('1h 30m 2h') == timedelta(hours=3, minutes=30)
True

Negative times are supported, too:

>>> parse_td('-1.5 weeks 3m 20s') == timedelta(days=-11, seconds=43400)
Expand All @@ -184,7 +189,7 @@ def parse_timedelta(text):
except ValueError:
raise ValueError('invalid time value for unit %r: %r'
% (unit, value))
td_kwargs[unit_key] = value
td_kwargs[unit_key] = td_kwargs.get(unit_key, 0) + value
return timedelta(**td_kwargs)


Expand Down
13 changes: 12 additions & 1 deletion tests/test_timeutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from boltons.timeutils import daterange, isoparse, Eastern
from boltons.timeutils import daterange, isoparse, Eastern, parse_timedelta


def test_daterange_years():
Expand Down Expand Up @@ -152,3 +152,14 @@ def test_us_timezone_fromutc_sets_fold():
assert second.replace(tzinfo=None) == datetime(2011, 11, 6, 1, 30)
assert second.fold == 1
assert second.tzname() == 'EST'


@pytest.mark.parametrize('text, expected', [
('1h 30m 2h', timedelta(hours=3, minutes=30)),
('1 day 2 days', timedelta(days=3)),
('1.5h -0.5h', timedelta(hours=1)),
('2s -2s', timedelta(0)),
('1w 2d 3h 4m 5s', timedelta(weeks=1, days=2, hours=3, minutes=4, seconds=5)),
])
def test_parse_timedelta_repeated_units(text, expected):
assert parse_timedelta(text) == expected