Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-04-15 20:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix strformat.strsize() test.

Browse source
This commit is contained in:
Bastian Kleineidam 2013-02-27 19:36:03 +01:00
parent b38317d57b
commit b7c82d1e75
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
linkcheck/strformat.py
View file

@ -1,5 +1,5 @@
# -*- coding: iso-8859-1 -*-
# Copyright (C) 2000-2012 Bastian Kleineidam
# Copyright (C) 2000-2013 Bastian Kleineidam
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -179,24 +179,24 @@ def remove_markup (s):
return s
def strsize (b):
def strsize (b, grouping=True):
"""Return human representation of bytes b. A negative number of bytes
raises a value error."""
if b < 0:
raise ValueError("Invalid negative byte number")
if b < 1024:
return u"%sB" % locale.format("%d", b, True)
return u"%sB" % locale.format("%d", b, grouping)
if b < 1024 * 10:
return u"%sKB" % locale.format("%d", (b // 1024), True)
return u"%sKB" % locale.format("%d", (b // 1024), grouping)
if b < 1024 * 1024:
return u"%sKB" % locale.format("%.2f", (float(b) / 1024), True)
return u"%sKB" % locale.format("%.2f", (float(b) / 1024), grouping)
if b < 1024 * 1024 * 10:
return u"%sMB" % locale.format("%.2f", (float(b) / (1024*1024)), True)
return u"%sMB" % locale.format("%.2f", (float(b) / (1024*1024)), grouping)
if b < 1024 * 1024 * 1024:
return u"%sMB" % locale.format("%.1f", (float(b) / (1024*1024)), True)
return u"%sMB" % locale.format("%.1f", (float(b) / (1024*1024)), grouping)
if b < 1024 * 1024 * 1024 * 10:
return u"%sGB" % locale.format("%.2f", (float(b) / (1024*1024*1024)), True)
return u"%sGB" % locale.format("%.1f", (float(b) / (1024*1024*1024)), True)
return u"%sGB" % locale.format("%.2f", (float(b) / (1024*1024*1024)), grouping)
return u"%sGB" % locale.format("%.1f", (float(b) / (1024*1024*1024)), grouping)
def strtime (t):

4
tests/test_strformat.py
View file

@ -1,5 +1,5 @@
# -*- coding: iso-8859-1 -*-
# Copyright (C) 2004-2012 Bastian Kleineidam
# Copyright (C) 2004-2013 Bastian Kleineidam
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -85,7 +85,7 @@ class TestStrFormat (unittest.TestCase):
self.assertEqual(linkcheck.strformat.strsize(0), "0B")
self.assertEqual(linkcheck.strformat.strsize(1), "1B")
self.assertEqual(linkcheck.strformat.strsize(2), "2B")
self.assertEqual(linkcheck.strformat.strsize(1023), "1023B")
self.assertEqual(linkcheck.strformat.strsize(1023, grouping=False), "1023B")
self.assertEqual(linkcheck.strformat.strsize(1024), "1KB")
self.assertEqual(linkcheck.strformat.strsize(1024*25), "25.00KB")
self.assertEqual(linkcheck.strformat.strsize(1024*1024), "1.00MB")