reorganized format_dt

[p2pool.git] / p2pool / util / math.py

diff --git a/p2pool/util/math.py b/p2pool/util/math.py
index 04ed3ff..71b5dec 100644 (file)
--- a/p2pool/util/math.py
+++ b/p2pool/util/math.py
@@ -82,7 +82,13 @@ def format(x):
     return '%i' % (x,) + s
 
 def format_dt(dt):
-    for value, name in [(365.2425*60*60*24, 'years'), (60*60*24, 'days'), (60*60, 'hours'), (60, 'minutes'), (1, 'seconds')]:
+    for value, name in [
+        (365.2425*60*60*24, 'years'),
+        (60*60*24, 'days'),
+        (60*60, 'hours'),
+        (60, 'minutes'),
+        (1, 'seconds'),
+    ]:
         if dt > value:
             break
     return '%.01f %s' % (dt/value, name)
@@ -230,3 +236,8 @@ class RateMonitor(object):
             self.first_timestamp = t
         else:
             self.datums.append((t, datum))
+
+def merge_dicts(*dicts):
+    res = {}
+    for d in dicts: res.update(d)
+    return res