From a1e7743b33eb3cc2c94775e95e5fc436a4d3f7ae Mon Sep 17 00:00:00 2001
From: Sebastian Koslowski <koslowski@kit.edu>
Date: Thu, 12 Feb 2015 10:41:01 +0100
Subject: grc: use 'import' for grc-generated hier_blocks (#763)
---
grc/python/Generator.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'grc/python/Generator.py')
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index a263679a8e..191ec18f35 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -219,8 +219,8 @@ class HierBlockGenerator(TopBlockGenerator):
"""
TopBlockGenerator.__init__(self, flow_graph, file_path)
self._mode = HIER_BLOCK_FILE_MODE
- self._file_name = self._flow_graph.get_option('id') + '.py'
- self._file_path = os.path.join(HIER_BLOCKS_LIB_DIR, self._file_name)
+ self._file_path = os.path.join(HIER_BLOCKS_LIB_DIR,
+ self._flow_graph.get_option('id') + '.py')
self._file_path_xml = self._file_path + '.xml'
def get_file_path_xml(self):
@@ -254,7 +254,8 @@ class HierBlockGenerator(TopBlockGenerator):
self._flow_graph.get_option('id').replace('_', ' ').title()
block_n['key'] = block_key
block_n['category'] = self._flow_graph.get_option('category')
- block_n['import'] = 'execfile(os.path.join(GRC_HIER_PATH, ' + repr(self._file_name) + '))'
+ block_n['import'] = "from {0} import {0} # grc-generated hier_block".format(
+ self._flow_graph.get_option('id'))
# make data
if parameters:
block_n['make'] = '{cls}(\n {kwargs},\n)'.format(
--
cgit v1.2.3