From: jacob.lyles <jacob.lyles@gmail.com>
Date: Fri, 30 Jul 2010 22:05:50 +0000 (-0700)
Subject: web: don't use %d formatting on a potentially large negative float -- there is a... 
X-Git-Url: https://git.rkrishnan.org/pf/content/en/service/rgr-080307.php?a=commitdiff_plain;h=d3e6e15e23bcc93fdfa9539e1b65bee53a800fae;p=tahoe-lafs%2Ftahoe-lafs.git

web: don't use %d formatting on a potentially large negative float -- there is a bug in Python 2.5 in that case
fixes #1055
---

diff --git a/src/allmydata/web/common.py b/src/allmydata/web/common.py
index d65e1867..8a0a9cb5 100644
--- a/src/allmydata/web/common.py
+++ b/src/allmydata/web/common.py
@@ -85,10 +85,10 @@ def abbreviate_time(data):
     if s >= 1.0:
         return "%.2fs" % s
     if s >= 0.01:
-        return "%dms" % (1000*s)
+        return "%.0fms" % (1000*s)
     if s >= 0.001:
         return "%.1fms" % (1000*s)
-    return "%dus" % (1000000*s)
+    return "%.0fus" % (1000000*s)
 
 def abbreviate_rate(data):
     # 21.8kBps, 554.4kBps 4.37MBps
@@ -99,7 +99,7 @@ def abbreviate_rate(data):
         return "%1.2fMBps" % (r/1000000)
     if r > 1000:
         return "%.1fkBps" % (r/1000)
-    return "%dBps" % r
+    return "%.0fBps" % r
 
 def abbreviate_size(data):
     # 21.8kB, 554.4kB 4.37MB
@@ -112,7 +112,7 @@ def abbreviate_size(data):
         return "%1.2fMB" % (r/1000000)
     if r > 1000:
         return "%.1fkB" % (r/1000)
-    return "%dB" % r
+    return "%.0fB" % r
 
 def plural(sequence_or_length):
     if isinstance(sequence_or_length, int):