diff options
| author | Seth Hitefield <sdhitefield@gmail.com> | 2016-09-22 12:15:51 -0400 |
|---|---|---|
| committer | Seth Hitefield <sdhitefield@gmail.com> | 2016-09-22 12:15:51 -0400 |
| commit | 5eb34fb72ffe46929fa2e99d84b4ead4f4083ca4 (patch) | |
| tree | 0c37e5d9eb43ae2327c808af45e439962fe4a289 | |
| parent | 8b2f679202c95896647231820eb07f42a2bc204b (diff) | |
grc: refactor: Cleaned up imports
| -rw-r--r-- | grc/gui/Actions.py | 6 | ||||
| -rw-r--r-- | grc/gui/Bars.py | 6 | ||||
| -rw-r--r-- | grc/gui/Config.py | 8 | ||||
| -rw-r--r-- | grc/gui/DrawingArea.py | 2 | ||||
| -rw-r--r-- | grc/gui/MainWindow.py | 7 | ||||
| -rw-r--r-- | grc/gui/ParserErrorsDialog.py | 5 | ||||
| -rw-r--r-- | grc/gui/Platform.py | 1 | ||||
| -rw-r--r-- | grc/gui/canvas/flowgraph.py | 3 |
8 files changed, 12 insertions, 26 deletions
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py index 4759e56294..601d0005fb 100644 --- a/grc/gui/Actions.py +++ b/grc/gui/Actions.py @@ -21,11 +21,7 @@ from __future__ import absolute_import import six -import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GObject +from gi.repository import Gtk, Gdk, GObject from . import Preferences diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py index d8d57843d7..1c63f01fa6 100644 --- a/grc/gui/Bars.py +++ b/grc/gui/Bars.py @@ -18,10 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ from __future__ import absolute_import -import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gtk -from gi.repository import GObject + +from gi.repository import Gtk, GObject from . import Actions diff --git a/grc/gui/Config.py b/grc/gui/Config.py index 0f40e06fce..0558892e2f 100644 --- a/grc/gui/Config.py +++ b/grc/gui/Config.py @@ -22,11 +22,11 @@ from __future__ import absolute_import, print_function import sys import os -from ..core.Config import Config as _Config +from ..core.Config import Config as CoreConfig from . import Constants -class Config(_Config): +class Config(CoreConfig): name = 'GNU Radio Companion' @@ -34,7 +34,7 @@ class Config(_Config): 'GRC_PREFS_PATH', os.path.expanduser('~/.gnuradio/grc.conf')) def __init__(self, install_prefix, *args, **kwargs): - _Config.__init__(self, *args, **kwargs) + CoreConfig.__init__(self, *args, **kwargs) self.install_prefix = install_prefix Constants.update_font_size(self.font_size) @@ -83,4 +83,4 @@ class Config(_Config): @default_qss_theme.setter def default_qss_theme(self, value): self._gr_prefs.set_string("qtgui", "qss", value) - self._gr_prefs.save()
\ No newline at end of file + self._gr_prefs.save() diff --git a/grc/gui/DrawingArea.py b/grc/gui/DrawingArea.py index f279d50557..cad813a876 100644 --- a/grc/gui/DrawingArea.py +++ b/grc/gui/DrawingArea.py @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ from __future__ import absolute_import -from gi.repository import Gtk, Gdk, GObject +from gi.repository import Gtk, Gdk, GObject from . import Constants, Colors diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py index e86273e288..5eabf33f67 100644 --- a/grc/gui/MainWindow.py +++ b/grc/gui/MainWindow.py @@ -21,12 +21,7 @@ from __future__ import absolute_import import os -import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GObject - +from gi.repository import Gtk, Gdk, GObject from . import Bars, Actions, Preferences, Utils from .BlockTreeWindow import BlockTreeWindow diff --git a/grc/gui/ParserErrorsDialog.py b/grc/gui/ParserErrorsDialog.py index 93a09287e8..050b9a4f98 100644 --- a/grc/gui/ParserErrorsDialog.py +++ b/grc/gui/ParserErrorsDialog.py @@ -21,10 +21,7 @@ from __future__ import absolute_import import six -import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gtk -from gi.repository import GObject +from gi.repository import Gtk, GObject from .Constants import MIN_DIALOG_WIDTH, MIN_DIALOG_HEIGHT diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py index 44380c579f..aeade75d78 100644 --- a/grc/gui/Platform.py +++ b/grc/gui/Platform.py @@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from __future__ import absolute_import, print_function import sys - import os from .Config import Config diff --git a/grc/gui/canvas/flowgraph.py b/grc/gui/canvas/flowgraph.py index 5969e00a43..ba13588355 100644 --- a/grc/gui/canvas/flowgraph.py +++ b/grc/gui/canvas/flowgraph.py @@ -26,9 +26,10 @@ from distutils.spawn import find_executable from itertools import count import six -from gi.repository import GLib from six.moves import filter +from gi.repository import GLib + from .drawable import Drawable from .. import Actions, Colors, Constants, Utils, Bars, Dialogs |