diff options
author | Maximilian Hils <git@maximilianhils.com> | 2019-11-07 18:19:50 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2019-11-07 18:19:50 +0100 |
commit | 80963966b267a4c3723e4773774b854602247bca (patch) | |
tree | f7e044209cec675b350cda347ec9ffd155692855 | |
parent | 3af4647804700bb6e86a9e1b73d7bf8612d872fa (diff) | |
download | mitmproxy-80963966b267a4c3723e4773774b854602247bca.tar.gz mitmproxy-80963966b267a4c3723e4773774b854602247bca.tar.bz2 mitmproxy-80963966b267a4c3723e4773774b854602247bca.zip |
make duration formatting more forgiving
-rw-r--r-- | mitmproxy/utils/human.py | 4 | ||||
-rw-r--r-- | test/mitmproxy/utils/test_human.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mitmproxy/utils/human.py b/mitmproxy/utils/human.py index 5c02b072..3158a294 100644 --- a/mitmproxy/utils/human.py +++ b/mitmproxy/utils/human.py @@ -48,12 +48,14 @@ def parse_size(s: typing.Optional[str]) -> typing.Optional[int]: raise ValueError("Invalid size specification.") -def pretty_duration(secs): +def pretty_duration(secs: typing.Optional[float]) -> str: formatters = [ (100, "{:.0f}s"), (10, "{:2.1f}s"), (1, "{:1.2f}s"), ] + if secs is None: + return "" for limit, formatter in formatters: if secs >= limit: diff --git a/test/mitmproxy/utils/test_human.py b/test/mitmproxy/utils/test_human.py index faf35f72..6f8bf732 100644 --- a/test/mitmproxy/utils/test_human.py +++ b/test/mitmproxy/utils/test_human.py @@ -47,6 +47,7 @@ def test_pretty_duration(): assert human.pretty_duration(10000) == "10000s" assert human.pretty_duration(1.123) == "1.12s" assert human.pretty_duration(0.123) == "123ms" + assert human.pretty_duration(None) == "" def test_format_address(): |