diff options
Diffstat (limited to 'grc/core/blocks/block.py')
| -rw-r--r-- | grc/core/blocks/block.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/grc/core/blocks/block.py b/grc/core/blocks/block.py index e0858957ab..adc046936d 100644 --- a/grc/core/blocks/block.py +++ b/grc/core/blocks/block.py @@ -55,7 +55,7 @@ class Block(Element): documentation = {'': ''} value = None - checks = [] + asserts = [] templates = MakoTemplates() parameters_data = [] @@ -127,11 +127,10 @@ class Block(Element): port_factory = self.parent_platform.make_port port_ids = set() - def make_stream_port_id(_pool=itertools.count()): - return {'sink': 'in', 'source': 'out'}[direction] + str(next(_pool)) + stream_port_ids = itertools.count() for i, port_data in enumerate(ports_n): - port_id = port_data.setdefault('id', make_stream_port_id()) + port_id = port_data.setdefault('id', str(next(stream_port_ids))) if port_id in port_ids: raise Exception('Port id "{}" already exists in {}s'.format(port_id, direction)) port_ids.add(port_id) @@ -191,18 +190,18 @@ class Block(Element): Evaluate the checks: each check must evaluate to True. """ Element.validate(self) - self._run_checks() + self._run_asserts() self._validate_generate_mode_compat() self._validate_var_value() - def _run_checks(self): + def _run_asserts(self): """Evaluate the checks""" - for check in self.checks: + for expr in self.asserts: try: - if not self.evaluate(check): - self.add_error_message('Check "{}" failed.'.format(check)) + if not self.evaluate(expr): + self.add_error_message('Assertion "{}" failed.'.format(expr)) except: - self.add_error_message('Check "{}" did not evaluate.'.format(check)) + self.add_error_message('Assertion "{}" did not evaluate.'.format(expr)) def _validate_generate_mode_compat(self): """check if this is a GUI block and matches the selected generate option""" |