diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-15 21:02:51 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-15 21:09:19 +0200 |
| commit | 8cfc8b3408916ccb156fc25102bc1d9346bc004b (patch) | |
| tree | 5c38adfedca3f4f4073d0621840ea578dd67ed4d /grc/core/Block.py | |
| parent | 036264ef5c8e2376acd426a99ca42d29390e3e2a (diff) | |
| parent | bdf85171b8a35004cdbf634f48ff696787b5fbde (diff) | |
Merge remote-tracking branch 'upstream/master' into refactoring
Diffstat (limited to 'grc/core/Block.py')
| -rw-r--r-- | grc/core/Block.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/grc/core/Block.py b/grc/core/Block.py index c2c7d4e821..6708986939 100644 --- a/grc/core/Block.py +++ b/grc/core/Block.py @@ -21,7 +21,6 @@ import collections import itertools from Cheetah.Template import Template -from UserDict import UserDict from .utils import epy_block_io, odict from . Constants import ( @@ -442,11 +441,10 @@ class Block(Element): self._params.remove(param) for key, value in blk_io.params: - if key in params: + try: param = params[key] - if not param.value_is_default(): - param.set_value(value) - else: + param.set_default(value) + except KeyError: # need to make a new param name = key.replace('_', ' ').title() n = odict(dict(name=name, key=key, type='raw', value=value)) param = platform.Param(block=self, n=n) |