diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-21 16:04:56 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-21 16:04:56 +0200 |
| commit | a03a3903153c8b495041eda48d8502084a2c92bb (patch) | |
| tree | 5a4f9624550afd290dcc81921784cfd1cdbbc9c0 /grc/core/Block.py | |
| parent | 176316287e5ca3bde51af50807cc58076dfec7e2 (diff) | |
| parent | 2a68b6844eb89cf2660b9973cecb42c53959b9ca (diff) | |
Merge branch 'maint_grcwg' into refactoring
Diffstat (limited to 'grc/core/Block.py')
| -rw-r--r-- | grc/core/Block.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/grc/core/Block.py b/grc/core/Block.py index 6708986939..cb4eb0db61 100644 --- a/grc/core/Block.py +++ b/grc/core/Block.py @@ -408,7 +408,7 @@ class Block(Element): param_src = self.get_param('_source_code') src = param_src.get_value() - src_hash = hash(src) + src_hash = hash((self.get_id(), src)) if src_hash == self._epy_source_hash: return @@ -430,8 +430,8 @@ class Block(Element): self._epy_source_hash = src_hash self._name = blk_io.name or blk_io.cls self._doc = 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 = {} |