diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-05 16:02:23 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-05 16:02:23 -0700 |
commit | d0eab54716703ed8aefec26539a6b94dfba38245 (patch) | |
tree | 6f634dbe525762523801d5d1cd18b1678a8e65a4 /grc/python/Block.py | |
parent | ffad6b12c290a6b5aa2ca70a375e28f552bbef00 (diff) | |
parent | 34f03132741fe1f7aa4e3e29272dea1d25526fbb (diff) |
Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint
Diffstat (limited to 'grc/python/Block.py')
-rw-r--r-- | grc/python/Block.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/grc/python/Block.py b/grc/python/Block.py index f5c994dc05..4118fda347 100644 --- a/grc/python/Block.py +++ b/grc/python/Block.py @@ -279,11 +279,10 @@ class Block(_Block, _GUIBlock): 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) |