9 files changed, 58 insertions, 69 deletions
diff --git a/grc/core/FlowGraph.py b/grc/core/FlowGraph.py
index e7a4b10c80..86d2bf63b4 100644
--- a/grc/core/FlowGraph.py
+++ b/grc/core/FlowGraph.py
@@ -22,10 +22,10 @@ from operator import methodcaller
 
 import re
 
-from .utils import odict, expr_utils
+from . import Messages
 from .Constants import FLOW_GRAPH_FILE_FORMAT_VERSION
 from .Element import Element
-from ..gui import Messages
+from .utils import odict, expr_utils
 
 _variable_matcher = re.compile('^(variable\w*)$')
 _parameter_matcher = re.compile('^(parameter)$')
diff --git a/grc/gui/Messages.py b/grc/core/Messages.py
index 551a8ce753..641ff72659 100644
--- a/grc/gui/Messages.py
+++ b/grc/core/Messages.py
@@ -1,21 +1,20 @@
-"""
-Copyright 2007 Free Software Foundation, Inc.
-This file is part of GNU Radio
-
-GNU Radio Companion is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-GNU Radio Companion is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-"""
+# Copyright 2007, 2015 Free Software Foundation, Inc.
+# This file is part of GNU Radio
+#
+# GNU Radio Companion is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# GNU Radio Companion is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
 
 import traceback
 import sys
diff --git a/grc/core/Platform.py b/grc/core/Platform.py
index 40e3e9cd5e..2907342be5 100644
--- a/grc/core/Platform.py
+++ b/grc/core/Platform.py
@@ -21,16 +21,15 @@ import os
 import sys
 from gnuradio import gr
 
-from . import ParseXML
+from . import ParseXML, Messages
 from .Constants import (
     BLOCK_TREE_DTD, FLOW_GRAPH_DTD, DOMAIN_DTD,
     HIER_BLOCKS_LIB_DIR, BLOCK_DTD, DEFAULT_FLOW_GRAPH, BLOCKS_DIRS,
     PREFS_FILE, CORE_TYPES, PREFS_FILE_OLD,
 )
 from .Element import Element
-from .utils import odict, extract_docs
-from ..gui import Messages
 from .generator import Generator
+from .utils import odict, extract_docs
 
 
 class Platform(Element):
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py
index 5ac8478471..e83b74db18 100644
--- a/grc/core/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@ -17,27 +17,24 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-import os
-import sys
+import shlex
 import subprocess
+import sys
 import tempfile
-import shlex
-import codecs
-import re  # for shlex_quote
 from distutils.spawn import find_executable
 
+import codecs
+import os
+import re  # for shlex_quote
 from Cheetah.Template import Template
 
 from .FlowGraphProxy import FlowGraphProxy
-from .. import ParseXML
-from ..utils import expr_utils, odict
+from .. import ParseXML, Messages
 from ..Constants import (
     TOP_BLOCK_FILE_MODE, BLOCK_FLAG_NEED_QT_GUI,
     XTERM_EXECUTABLE, HIER_BLOCK_FILE_MODE, HIER_BLOCKS_LIB_DIR, BLOCK_DTD
 )
-
-from grc.gui import Messages
-
+from ..utils import expr_utils, odict
 
 DATA_DIR = os.path.dirname(__file__)
 FLOW_GRAPH_TEMPLATE = os.path.join(DATA_DIR, 'flow_graph.tmpl')
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 6a935740eb..ab7839b20e 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -17,28 +17,25 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
+import os
 import subprocess
 from threading import Thread
 
-import os
-import pygtk
-
-pygtk.require('2.0')
 import gtk
 import gobject
 
-
-from ..core import Constants, ParseXML
-from .. core.Constants import XTERM_EXECUTABLE
-
-from . import Dialogs, Messages, Preferences, Actions
-from .ParserErrorsDialog import ParserErrorsDialog
-from .MainWindow import MainWindow
-from .PropsDialog import PropsDialog
+from . import Dialogs, Preferences, Actions
+from .Constants import DEFAULT_CANVAS_SIZE, IMAGE_FILE_EXTENSION, GR_PREFIX
 from .FileDialogs import (OpenFlowGraphFileDialog, SaveFlowGraphFileDialog,
                           SaveReportsFileDialog, SaveScreenShotDialog,
                           OpenQSSFileDialog)
-from .Constants import DEFAULT_CANVAS_SIZE, IMAGE_FILE_EXTENSION, GR_PREFIX
+from .MainWindow import MainWindow
+from .ParserErrorsDialog import ParserErrorsDialog
+from .PropsDialog import PropsDialog
+
+from ..core import Constants, ParseXML
+from ..core.Constants import XTERM_EXECUTABLE
+from ..core import Messages
 
 gobject.threads_init()
 
diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py
index f2941250a8..7d55e1b2e7 100644
--- a/grc/gui/Dialogs.py
+++ b/grc/gui/Dialogs.py
@@ -17,15 +17,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-import pygtk
-pygtk.require('2.0')
 import gtk
 
 import sys
 from distutils.spawn import find_executable
 
-
-from . import Utils, Actions, Constants, Messages
+from . import Utils, Actions, Constants
+from ..core import Messages
 
 
 class SimpleTextDisplay(gtk.TextView):
diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py
index 28fc48fc13..25fb157b1e 100644
--- a/grc/gui/FlowGraph.py
+++ b/grc/gui/FlowGraph.py
@@ -17,20 +17,21 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-import random
 import functools
+import random
+from distutils.spawn import find_executable
 from itertools import chain, count
 from operator import methodcaller
-from distutils.spawn import find_executable
 
 import gobject
 
-from . import Actions, Colors, Constants, Utils, Messages, Bars, Dialogs
-from . Element import Element
-from . Constants import SCROLL_PROXIMITY_SENSITIVITY, SCROLL_DISTANCE
-from . external_editor import ExternalEditor
+from . import Actions, Colors, Constants, Utils, Bars, Dialogs
+from .Constants import SCROLL_PROXIMITY_SENSITIVITY, SCROLL_DISTANCE
+from .Element import Element
+from .external_editor import ExternalEditor
 
 from ..core.FlowGraph import FlowGraph as _Flowgraph
+from ..core import Messages
 
 
 class FlowGraph(Element, _Flowgraph):
diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py
index a340bcc817..18118dbd79 100644
--- a/grc/gui/MainWindow.py
+++ b/grc/gui/MainWindow.py
@@ -17,21 +17,19 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from Constants import \
-    NEW_FLOGRAPH_TITLE, DEFAULT_REPORTS_WINDOW_WIDTH
-import Actions
-import pygtk
-pygtk.require('2.0')
-import gtk
-import Bars
-from BlockTreeWindow import BlockTreeWindow
-from Dialogs import TextDisplay, MessageDialogHelper
-from NotebookPage import NotebookPage
-import Preferences
-import Messages
-import Utils
 import os
 
+import gtk
+
+from . import Bars, Actions, Preferences, Utils
+from .BlockTreeWindow import BlockTreeWindow
+from .Constants import \
+    NEW_FLOGRAPH_TITLE, DEFAULT_REPORTS_WINDOW_WIDTH
+from .Dialogs import TextDisplay, MessageDialogHelper
+from .NotebookPage import NotebookPage
+
+from ..core import Messages
+
 MAIN_WINDOW_TITLE_TMPL = """\
 #if not $saved
 *#slurp
diff --git a/volk b/volk
-Subproject 41b4df055b2c8d4f2c23ad2bdc60c0b47b4f0dd
+Subproject c2c7f82aea2ed99df66fad2b91ed29791d7818a