summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan2009-09-25 13:24:53 -0700
committerJohnathan Corgan2009-09-25 13:24:53 -0700
commit9a64a37f23ea4ea7571ad6dff873a2b43551b9aa (patch)
tree9cb1a2ca7b4649b00f4399e8c306634c4a493247
parent368d4a0be388cd052510b06a3f3ddfbdf48be024 (diff)
parentdcd4b6efd6e0a0130fbdc8f8aa5db1bc182e653f (diff)
downloadgnuradio-9a64a37f23ea4ea7571ad6dff873a2b43551b9aa.tar.gz
gnuradio-9a64a37f23ea4ea7571ad6dff873a2b43551b9aa.tar.bz2
gnuradio-9a64a37f23ea4ea7571ad6dff873a2b43551b9aa.zip
Merge branch 'grc' of http://gnuradio.org/git/jblum
* 'grc' of http://gnuradio.org/git/jblum: hash the tuple of hashes to id the current params
-rw-r--r--grc/base/Block.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/grc/base/Block.py b/grc/base/Block.py
index 203e878e4..b2015cc40 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -239,7 +239,7 @@ class Block(Element):
that are needed for the connections creation phase.
@param n the nested data odict
"""
- get_hash = lambda: reduce(lambda x, y: x ^ y, [hash(param) for param in self.get_params()], 0)
+ get_hash = lambda: hash(tuple(map(hash, self.get_params())))
my_hash = 0
while get_hash() != my_hash:
params_n = n.findall('param')