From 9023d2ad1ad5d1704bbe7fe942e42156a1f273a4 Mon Sep 17 00:00:00 2001
From: Sebastian Koslowski <koslowski@kit.edu>
Date: Fri, 5 Feb 2016 16:44:10 +0100
Subject: grc-refactor: cmake fixes and more reorganizing
---
grc/core/generator/Generator.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'grc/core/generator/Generator.py')
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py
index b1fb73b821..4cb04bd4da 100644
--- a/grc/core/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@ -28,9 +28,8 @@ from distutils.spawn import find_executable
from Cheetah.Template import Template
-from .. import ParseXML, expr_utils
-from ..odict import odict
-
+from .. import ParseXML
+from ..utils import expr_utils, odict
from ..Constants import (
TOP_BLOCK_FILE_MODE, BLOCK_FLAG_NEED_QT_GUI,
XTERM_EXECUTABLE, HIER_BLOCK_FILE_MODE, HIER_BLOCKS_LIB_DIR, BLOCK_DTD
@@ -262,7 +261,7 @@ class TopBlockGenerator(object):
callbacks = [
expr_utils.expr_replace(cb, replace_dict)
for cb in sum([block.get_callbacks() for block in fg.get_enabled_blocks()], [])
- ]
+ ]
# Map var id to callbacks
var_id2cbs = dict([
(var_id, filter(lambda c: expr_utils.get_variable_dependencies(c, [var_id]), callbacks))
--
cgit v1.2.3