Skip to content

Accept hr and hrs as hour abbreviations #85

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
codeofwxz wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −2
Open

Accept hr and hrs as hour abbreviations #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1b9f7b
Accept hr and hrs as hour abbreviations
codeofwxz Sep 16, 2026
fccf417
Document hr and hrs in supported time units
codeofwxz Sep 16, 2026
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
4 changes: 2 additions & 2 deletions humanfriendly/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
dict(divider=1e-3, singular='millisecond', plural='milliseconds', abbreviations=['ms']),
dict(divider=1, singular='second', plural='seconds', abbreviations=['s', 'sec', 'secs']),
dict(divider=60, singular='minute', plural='minutes', abbreviations=['m', 'min', 'mins']),
dict(divider=60 * 60, singular='hour', plural='hours', abbreviations=['h']),
dict(divider=60 * 60, singular='hour', plural='hours', abbreviations=['h', 'hr', 'hrs']),
dict(divider=60 * 60 * 24, singular='day', plural='days', abbreviations=['d']),
dict(divider=60 * 60 * 24 * 7, singular='week', plural='weeks', abbreviations=['w']),
dict(divider=60 * 60 * 24 * 7 * 52, singular='year', plural='years', abbreviations=['y']))
Expand Down Expand Up @@ -483,7 +483,7 @@ def parse_timespan(timespan):
- ms, millisecond, milliseconds
- s, sec, secs, second, seconds
- m, min, mins, minute, minutes
- h, hour, hours
- h, hr, hrs, hour, hours
- d, day, days
- w, week, weeks
- y, year, years
Expand Down
10 changes: 10 additions & 0 deletions humanfriendly/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,16 @@ def test_format_timespan(self):
then = now - datetime.timedelta(hours=23)
assert '23 hours' == format_timespan(now - then)

def test_parse_timespan_hour_abbreviations(self):
"""Accept hour abbreviations without changing existing aliases."""
for unit in ('h', 'hr', 'hrs', 'hour', 'hours'):
for spelling in (unit, unit.upper()):
self.assertEqual(0, parse_timespan('0' + spelling))
self.assertEqual(3600, parse_timespan('1 ' + spelling))
self.assertEqual(9000, parse_timespan('2.5' + spelling))
with self.assertRaises(InvalidTimespan):
parse_timespan('1 hrss')

def test_parse_timespan(self):
"""Test :func:`humanfriendly.parse_timespan()`."""
self.assertEqual(0, parse_timespan('0'))
Expand Down