From 9f5ef34ac05de070a99fae07eb1a8087ba60a653 Mon Sep 17 00:00:00 2001
From: Sebastian Koslowski <koslowski@kit.edu>
Date: Fri, 20 Nov 2015 17:28:17 +0100
Subject: grc-refactor: move grc.base to grc.python.base
---
grc/python/Block.py | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
(limited to 'grc/python/Block.py')
diff --git a/grc/python/Block.py b/grc/python/Block.py
index f43b006e5f..aaf65fbddf 100644
--- a/grc/python/Block.py
+++ b/grc/python/Block.py
@@ -17,20 +17,18 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
"""
-import itertools
import collections
+import itertools
-from .. base.Constants import BLOCK_FLAG_NEED_QT_GUI, BLOCK_FLAG_NEED_WX_GUI
-from .. base.odict import odict
-
-from .. base.Block import Block as _Block
-from .. gui.Block import Block as _GUIBlock
+from .base.Constants import BLOCK_FLAG_NEED_QT_GUI, BLOCK_FLAG_NEED_WX_GUI
+from .base.odict import odict
+from .base.Block import Block as _Block
-from . FlowGraph import _variable_matcher
from . import epy_block_io
+from .FlowGraph import _variable_matcher
-class Block(_Block, _GUIBlock):
+class Block(_Block):
def __init__(self, flow_graph, n):
"""
@@ -59,7 +57,6 @@ class Block(_Block, _GUIBlock):
flow_graph=flow_graph,
n=n,
)
- _GUIBlock.__init__(self)
self._epy_source_hash = -1 # for epy blocks
self._epy_reload_error = None
--
cgit v1.2.3