remove humanize, use internal method, teach internal method to understand timedelta

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / util / abbreviate.py

diff --git a/src/allmydata/util/abbreviate.py b/src/allmydata/util/abbreviate.py
index 4bc170618cc5abe83d156953f76999be7cbcf3d8..2bce7dcfd0335346ff85f41d73bb3eac1b07527d 100644 (file)
--- a/src/allmydata/util/abbreviate.py
+++ b/src/allmydata/util/abbreviate.py
@@ -1,5 +1,6 @@
 
 import re
+from datetime import timedelta
 
 HOUR = 3600
 DAY = 24*3600
@@ -8,11 +9,18 @@ MONTH = 30*DAY
 YEAR = 365*DAY
 
 def abbreviate_time(s):
+    postfix = ''
+    if isinstance(s, timedelta):
+        s = s.total_seconds()
+        if s >= 0.0:
+            postfix = ' ago'
+        else:
+            postfix = ' in the future'
     def _plural(count, unit):
         count = int(count)
         if count == 1:
-            return "%d %s" % (count, unit)
-        return "%d %ss" % (count, unit)
+            return "%d %s%s" % (count, unit, postfix)
+        return "%d %ss%s" % (count, unit, postfix)
     if s is None:
         return "unknown"
     if s < 120: