Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 2 additions & 9 deletions pyperf/_formatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,8 @@ def format_number(number, unit=None, units=None):
number = '10^%s' % pow10

if isinstance(number, int) and number > 8192:
pow2 = 0
x = number
while x >= 2:
x, r = divmod(x, 2)
pow2 += 1
if r:
break
if not r:
number = '2^%s' % pow2
if number & (number-1) == 0:
number = '2^%s' % (number.bit_length() - 1)

if not unit:
return str(number)
Expand Down
6 changes: 3 additions & 3 deletions pyperf/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,15 @@ def test_format_number(self):
self.assertEqual(format_number(33 * 10 ** 4, 'unit'),
'330000 units')

# powers of 10
# powers of 2
self.assertEqual(format_number(2 ** 10, 'unit'),
'1024 units')
self.assertEqual(format_number(2 ** 15, 'unit'),
'2^15 units')
self.assertEqual(format_number(2 ** 15),
'2^15')
self.assertEqual(format_number(2 ** 10 + 1, 'unit'),
'1025 units')
self.assertEqual(format_number(2 ** 15 - 1), '32767')
self.assertEqual(format_number(2 ** 15 + 1), '32769')

def test_format_filesize(self):
self.assertEqual(format_filesize(0),
Expand Down