diff options
| author | Sebastian Koslowski <sebastian.koslowski@gmail.com> | 2019-02-07 22:41:39 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <sebastian.koslowski@gmail.com> | 2019-02-12 11:46:09 +0100 |
| commit | b17a9b3f0672318cb6fa240d14aed14ffffebe69 (patch) | |
| tree | f98e7f0a3b999a18d921d890eb25f093f8300e3a /grc/core/blocks/_build.py | |
| parent | b65911e6ee71ad8ce7085cc6b781744e816f7ae8 (diff) | |
grc: fixes in epy and virtual blocks (fixes #2039)
Diffstat (limited to 'grc/core/blocks/_build.py')
| -rw-r--r-- | grc/core/blocks/_build.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/grc/core/blocks/_build.py b/grc/core/blocks/_build.py index bed0f6934a..bd2c3fd6df 100644 --- a/grc/core/blocks/_build.py +++ b/grc/core/blocks/_build.py @@ -20,7 +20,6 @@ from __future__ import absolute_import import collections import itertools import re -import six from ..Constants import ADVANCED_PARAM_TAB from ..utils import to_list @@ -50,10 +49,10 @@ def build(id, label='', category='', flags='', documentation='', cls.asserts = [_single_mako_expr(a, block_id) for a in to_list(asserts)] - cls.inputs_data = _build_ports(inputs, 'sink') if inputs else [] - cls.outputs_data = _build_ports(outputs, 'source') if outputs else [] - cls.parameters_data = _build_params(parameters or [], - bool(cls.inputs_data), bool(cls.outputs_data), cls.flags, block_id) + cls.inputs_data = build_ports(inputs, 'sink') if inputs else [] + cls.outputs_data = build_ports(outputs, 'source') if outputs else [] + cls.parameters_data = build_params(parameters or [], + bool(cls.inputs_data), bool(cls.outputs_data), cls.flags, block_id) cls.extra_data = kwargs templates = templates or {} @@ -81,7 +80,7 @@ def build(id, label='', category='', flags='', documentation='', return cls -def _build_ports(ports_raw, direction): +def build_ports(ports_raw, direction): ports = [] port_ids = set() stream_port_ids = itertools.count() @@ -99,7 +98,7 @@ def _build_ports(ports_raw, direction): return ports -def _build_params(params_raw, have_inputs, have_outputs, flags, block_id): +def build_params(params_raw, have_inputs, have_outputs, flags, block_id): params = [] def add_param(**data): @@ -117,9 +116,9 @@ def _build_params(params_raw, have_inputs, have_outputs, flags, block_id): if have_outputs: add_param(id='minoutbuf', name='Min Output Buffer', dtype='int', - hide='part', value='0', category=ADVANCED_PARAM_TAB) + hide='part', default='0', category=ADVANCED_PARAM_TAB) add_param(id='maxoutbuf', name='Max Output Buffer', dtype='int', - hide='part', value='0', category=ADVANCED_PARAM_TAB) + hide='part', default='0', category=ADVANCED_PARAM_TAB) base_params_n = {} for param_data in params_raw: @@ -138,7 +137,7 @@ def _build_params(params_raw, have_inputs, have_outputs, flags, block_id): base_params_n[param_id] = param_data_ext add_param(id='comment', name='Comment', dtype='_multiline', hide='part', - value='', category=ADVANCED_PARAM_TAB) + default='', category=ADVANCED_PARAM_TAB) return params |