diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-21 15:19:30 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-21 15:57:10 +0200 |
| commit | 2a68b6844eb89cf2660b9973cecb42c53959b9ca (patch) | |
| tree | 830ef440f660599b35d1070ab3bf8666d457c780 | |
| parent | 240fd75770bc71435630768ea4767d55ce24bf2b (diff) | |
grc: avoid name clashes when importing epy block and really fix epy block c&p
| -rw-r--r-- | grc/gui/FlowGraph.py | 11 | ||||
| -rw-r--r-- | grc/python/Block.py | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py index f315431c57..2053e86454 100644 --- a/grc/gui/FlowGraph.py +++ b/grc/gui/FlowGraph.py @@ -195,12 +195,13 @@ class FlowGraph(Element): continue # unknown block was pasted (e.g. dummy block) selected.add(block) #set params + params = dict((n.find('key'), n.find('value')) + for n in block_n.findall('param')) if block_key == 'epy_block': - block.rewrite() - params_n = block_n.findall('param') - for param_n in params_n: - param_key = param_n.find('key') - param_value = param_n.find('value') + block.get_param('_io_cache').set_value(params.pop('_io_cache')) + block.get_param('_source_code').set_value(params.pop('_source_code')) + block.rewrite() # this creates the other params + for param_key, param_value in params.iteritems(): #setup id parameter if param_key == 'id': old_id2block[param_value] = block diff --git a/grc/python/Block.py b/grc/python/Block.py index 8509aa3fc6..782893fd8f 100644 --- a/grc/python/Block.py +++ b/grc/python/Block.py @@ -247,7 +247,7 @@ class Block(_Block, _GUIBlock): doc_end_tag = 'Block Documentation:' src = param_src.get_value() - src_hash = hash(src) + src_hash = hash((self.get_id(), src)) if src_hash == self._epy_source_hash: return @@ -265,12 +265,11 @@ class Block(_Block, _GUIBlock): param_blk.set_value(repr(tuple(blk_io))) # print "Rewriting embedded python block {!r}".format(self.get_id()) - self._epy_source_hash = src_hash self._name = blk_io.name or blk_io.cls self._doc = self._doc.split(doc_end_tag)[0] + doc_end_tag + '\n' + blk_io.doc - self._imports[0] = 'from {} import {}'.format(self.get_id(), blk_io.cls) - self._make = '{}({})'.format(blk_io.cls, ', '.join( + self._imports[0] = 'import ' + self.get_id() + self._make = '{0}.{1}({2})'.format(self.get_id(), blk_io.cls, ', '.join( '{0}=${0}'.format(key) for key, _ in blk_io.params)) params = {} |