summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Rode <mail@andrejro.de>2018-07-26 16:42:12 +0200
committerMarcus Müller <marcus@hostalia.de>2018-07-30 16:45:39 +0200
commit6be6c319db32eb285a217f41b2a7734c13c25452 (patch)
treefc7d3e90c3a6fd7af4ab5a6d533324da09a270da
parent744f658316a20dbbb14d01092742c446c7b95522 (diff)
grc: fix renaming of import -> imports in YAML syntax
-rw-r--r--grc/converter/flow_graph.py2
-rw-r--r--grc/gui/VariableEditor.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/grc/converter/flow_graph.py b/grc/converter/flow_graph.py
index d20c67703c..5b4a750ef6 100644
--- a/grc/converter/flow_graph.py
+++ b/grc/converter/flow_graph.py
@@ -82,6 +82,8 @@ def convert_block(data):
(param.findtext('key'), param.findtext('value'))
for param in data.findall('param')
))
+ if block_id == "import":
+ params["imports"] = params.pop("import")
states = OrderedDict()
x, y = ast.literal_eval(params.pop('_coordinate', '(10, 10)'))
states['coordinate'] = yaml.ListFlowing([x, y])
diff --git a/grc/gui/VariableEditor.py b/grc/gui/VariableEditor.py
index c179c8bc84..ec4ad611ee 100644
--- a/grc/gui/VariableEditor.py
+++ b/grc/gui/VariableEditor.py
@@ -174,7 +174,7 @@ class VariableEditor(Gtk.VBox):
# Block specific values
if block:
if block.key == 'import':
- value = block.params['import'].get_value()
+ value = block.params['imports'].get_value()
elif block.key != "variable":
value = "<Open Properties>"
sp('editable', False)