From 7c6d3e9c3bfee7caf51c83e6acb28465ac0fc94f Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Fri, 27 Dec 2013 23:16:31 +0100 Subject: [PATCH] decimal(): fix missing parameter `prec` and update tests --- picard/util/bytes2human.py | 2 +- test/test_bytes2human.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/picard/util/bytes2human.py b/picard/util/bytes2human.py index 34dc33459..9b31c23b3 100644 --- a/picard/util/bytes2human.py +++ b/picard/util/bytes2human.py @@ -51,7 +51,7 @@ def decimal(number, prec=1): >>> [decimal(n) for n in [1000, 1024, 15500]] ['1 kB', '1 kB', '15.5 kB'] """ - return short_string(int(number), 1000) + return short_string(int(number), 1000, prec) def binary(number, prec=1): diff --git a/test/test_bytes2human.py b/test/test_bytes2human.py index 7a37737c2..9f8d53305 100644 --- a/test/test_bytes2human.py +++ b/test/test_bytes2human.py @@ -30,8 +30,11 @@ class Testbytes2human(unittest.TestCase): self.assertEqual(bytes2human.binary(45682), '44.6 KiB') self.assertEqual(bytes2human.binary(-45682), '-44.6 KiB') + self.assertEqual(bytes2human.binary(-45682, 2), '-44.61 KiB') self.assertEqual(bytes2human.decimal(45682), '45.7 kB') + self.assertEqual(bytes2human.decimal(45682, 2), '45.68 kB') self.assertEqual(bytes2human.decimal(9223372036854775807), '9223.4 PB') + self.assertEqual(bytes2human.decimal(9223372036854775807, 3), '9223.372 PB') self.assertEqual(bytes2human.decimal(123.6), '123 B') self.assertRaises(ValueError, bytes2human.decimal, 'xxx') self.assertRaises(ValueError, bytes2human.decimal, '123.6')