diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2015-11-20 17:28:17 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-02-17 19:55:16 +0100 |
| commit | 9f5ef34ac05de070a99fae07eb1a8087ba60a653 (patch) | |
| tree | 44ab20b78404c94e85689b8511521e7456d58e3d /grc/python/Block.py | |
| parent | 64f3b70cf135a8641a0271ee27b431e05a8df97b (diff) | |
grc-refactor: move grc.base to grc.python.base
Diffstat (limited to 'grc/python/Block.py')
| -rw-r--r-- | grc/python/Block.py | 15 |
1 files changed, 6 insertions, 9 deletions
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 |