diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-11-12 06:27:10 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-11-12 06:27:10 -0800 |
| commit | 1775fb0d48138e5ced15cdc2fbef01589f294a2c (patch) | |
| tree | 1bef2a185beadf124c9471d8ad3280f355c4a712 | |
| parent | f708cc395fa46264f692180ec4ced72fb6de62f7 (diff) | |
| parent | 27b6192c51bd42d8dc90d3a326a1c66e18ddbb33 (diff) | |
Merge remote-tracking branch 'skoslowski/fix_1089' into maint
| -rw-r--r-- | grc/core/utils/epy_block_io.py | 2 | ||||
| -rw-r--r-- | grc/gui/ActionHandler.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/grc/core/utils/epy_block_io.py b/grc/core/utils/epy_block_io.py index 76b50051db..4eb4d6d4e5 100644 --- a/grc/core/utils/epy_block_io.py +++ b/grc/core/utils/epy_block_io.py @@ -19,7 +19,7 @@ def _ports(sigs, msgs): for i, dtype in enumerate(sigs): port_type = TYPE_MAP.get(dtype.name, None) if not port_type: - raise ValueError("Can't map {0:!r} to GRC port type".format(dtype)) + raise ValueError("Can't map {0!r} to GRC port type".format(dtype)) ports.append((str(i), port_type)) for msg_key in msgs: if msg_key == 'system': diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py index ec5ac7c574..b9f534fdf0 100644 --- a/grc/gui/ActionHandler.py +++ b/grc/gui/ActionHandler.py @@ -515,8 +515,9 @@ class ActionHandler: elif action == Actions.FLOW_GRAPH_NEW: main.new_page() if args: + flow_graph = main.get_flow_graph() flow_graph._options_block.get_param('generate_options').set_value(args[0]) - flow_graph_update() + flow_graph_update(flow_graph) elif action == Actions.FLOW_GRAPH_OPEN: file_paths = args if args else OpenFlowGraphFileDialog(page.get_file_path()).run() if file_paths: #open a new page for each file, show only the first |