git://git.novaco.in
/
p2pool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
fixed incompatibility bug with pypy
[p2pool.git]
/
p2pool
/
util
/
math.py
diff --git
a/p2pool/util/math.py
b/p2pool/util/math.py
index
04ed3ff
..
6ceb9ff
100644
(file)
--- a/
p2pool/util/math.py
+++ b/
p2pool/util/math.py
@@
-230,3
+230,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