Skip to content

Carry rounded lengths into kilometres #88

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

Carry rounded lengths into kilometres #88

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
6 changes: 5 additions & 1 deletion humanfriendly/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,13 @@ def format_length(num_metres, keep_width=False):
>>> format_length(0.004)
'4 mm'
"""
for unit in reversed(length_size_units):
units = list(reversed(length_size_units))
for index, unit in enumerate(units):
if num_metres >= unit['divider']:
number = round_number(float(num_metres) / unit['divider'], keep_width=keep_width)
if index and float(number) >= units[index - 1]['divider'] / unit['divider']:
unit = units[index - 1]
number = round_number(float(num_metres) / unit['divider'], keep_width=keep_width)
return pluralize(number, unit['singular'], unit['plural'])
return pluralize(num_metres, 'metre')

Expand Down
1 change: 1 addition & 0 deletions humanfriendly/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ def test_format_length(self):
self.assertEqual('1 metre', format_length(1))
self.assertEqual('42 metres', format_length(42))
self.assertEqual('1 km', format_length(1 * 1000))
self.assertEqual('1 km', format_length(999.999))
self.assertEqual('15.3 cm', format_length(0.153))
self.assertEqual('1 cm', format_length(1e-02))
self.assertEqual('1 mm', format_length(1e-03))
Expand Down