From 81f19eb412ffab67958c73487e2ab0630c56a5f2 Mon Sep 17 00:00:00 2001
From: cncfanatics <diego.duclos@gmail.com>
Date: Mon, 11 Oct 2010 12:43:27 +0200
Subject: [PATCH] Fix an endless loop and optimize

---
 util.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/util.py b/util.py
index 1a43eabb8..e76b3d48d 100644
--- a/util.py
+++ b/util.py
@@ -1,3 +1,5 @@
+import math
+
 def formatAmount(val, prec=3, lowest=0, highest=0):
     """
     Add suffix to value, transform value to match new suffix and round it.
@@ -57,17 +59,10 @@ def processAmount(val, prec=3):
 
     Integer numbers are not rounded, only fractional part.
     """
-    # Check if we have no integer and some fraction after bunch of zeroes,
-    # counting these zeros in process
-    shiftFraction, integersNumber = 0, 0
-    if int(val) == 0 and val != 0:
-        while val < 0.1**(shiftFraction+1):
-            shiftFraction += 1
-    else:
-        while abs(val) >= 10**(integersNumber):
-            integersNumber +=1
-    # We want to show at least (prec) significant numbers in any cases
-    roundFactor = prec + shiftFraction - integersNumber
+    if val == 0: # Logarithm is not defined for zero
+        return "0"
+
+    roundFactor = int(prec - math.ceil(math.log10(abs(val))))
     # But we don't want to round integers
     if roundFactor < 0: roundFactor = 0
     val = round(val, roundFactor)