From dbf58fa349002d94c26883b130ed8864ead79ea6 Mon Sep 17 00:00:00 2001
From: Seth Hitefield <sdhitefield@gmail.com>
Date: Tue, 1 Aug 2017 16:52:59 -0400
Subject: grc: Bug fixes for flowgraph complexity
---
grc/core/FlowGraph.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'grc/core/FlowGraph.py')
diff --git a/grc/core/FlowGraph.py b/grc/core/FlowGraph.py
index 481dda5786..3f21ec6a9c 100644
--- a/grc/core/FlowGraph.py
+++ b/grc/core/FlowGraph.py
@@ -387,9 +387,9 @@ class FlowGraph(Element):
had_connect_errors = False
_blocks = {block.name: block for block in self.blocks}
- # TODO: Crashes if connections section exists without actual connections.
- for src_blk_id, src_port_id, snk_blk_id, snk_port_id in data.get('connections', []):
- try:
+ try:
+ # TODO: Add better error handling if no connections exist in the flowgraph file.
+ for src_blk_id, src_port_id, snk_blk_id, snk_port_id in data.get('connections', []):
source_block = _blocks[src_blk_id]
sink_block = _blocks[snk_blk_id]
@@ -404,11 +404,11 @@ class FlowGraph(Element):
self.connect(source_port, sink_port)
- except (KeyError, LookupError) as e:
- Messages.send_error_load(
- 'Connection between {}({}) and {}({}) could not be made.\n\t{}'.format(
- src_blk_id, src_port_id, snk_blk_id, snk_port_id, e))
- had_connect_errors = True
+ except (KeyError, LookupError) as e:
+ Messages.send_error_load(
+ 'Connection between {}({}) and {}({}) could not be made.\n\t{}'.format(
+ src_blk_id, src_port_id, snk_blk_id, snk_port_id, e))
+ had_connect_errors = True
self.rewrite() # global rewrite
return had_connect_errors
--
cgit v1.2.3