ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make abbreviate_space able to output in exabytes. refs #1812

Browse Source 
Signed-off-by: David-Sarah Hopwood <davidsarah@mint>
This commit is contained in:
David-Sarah Hopwood 2012-12-27 20:08:27 +00:00
parent 6d2ca45c4a
commit 3888915996
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/test/test_util.py
View File

@ -733,7 +733,8 @@ class Abbreviate(unittest.TestCase):
(1000*1000*1000, "1.00 GB"),
(1000*1000*1000*1000, "1.00 TB"),
(1000*1000*1000*1000*1000, "1.00 PB"),
(1234567890123456, "1.23 PB"),
(1000*1000*1000*1000*1000*1000, "1.00 EB"),
(1234567890123456789, "1.23 EB"),
]
for (x, expected) in tests_si:
got = abbreviate.abbreviate_space(x, SI=True)
@ -753,7 +754,8 @@ class Abbreviate(unittest.TestCase):
(1024*1024*1024*1024, "1.00 TiB"),
(1000*1000*1000*1000*1000, "909.49 TiB"),
(1024*1024*1024*1024*1024, "1.00 PiB"),
(1234567890123456, "1.10 PiB"),
(1024*1024*1024*1024*1024*1024, "1.00 EiB"),
(1234567890123456789, "1.07 EiB"),
]
for (x, expected) in tests_base1024:
got = abbreviate.abbreviate_space(x, SI=False)

4
src/allmydata/util/abbreviate.py
View File

@ -49,7 +49,9 @@ def abbreviate_space(s, SI=True):
return r(s/(U*U*U), "G")
if s < U*U*U*U*U:
return r(s/(U*U*U*U), "T")
return r(s/(U*U*U*U*U), "P")
if s < U*U*U*U*U*U:
return r(s/(U*U*U*U*U), "P")
return r(s/(U*U*U*U*U*U), "E")
def abbreviate_space_both(s):
return "(%s, %s)" % (abbreviate_space(s, True),