gui: reshuffle the includes until gi and flake8 are happy

We have implied inclusion orders here, specifically with gi. This works as
long as the files are included in the right order from other files but its not
generic enough - we really do need the gi.require_version() bit
everywhere to avoid issues.

Of course, once we do this flake8 complains about everything so let's
reshuffle things in an order it's happy with. This seems to be local modules
first, then ... whatever except when not?

application.py is excluded from this patch because it's about to get changed
in the next one and I'm too lazy to separate those out.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

tuhi/gui/drawing.py

@@ -12,7 +12,6 @@
 #
 
 from gettext import gettext as _
-from gi.repository import GObject, Gtk, GdkPixbuf, Gdk
 
 import xdg.BaseDirectory
 import os
@@ -22,6 +21,8 @@ from tuhi.svg import JsonSvg
 
 import gi
 gi.require_version("Gtk", "3.0")
+from gi.repository import GObject, Gtk, GdkPixbuf, Gdk  # NOQA
+
 
 DATA_PATH = Path(xdg.BaseDirectory.xdg_cache_home, 'tuhi', 'svg')
 

tuhi/gui/drawingperspective.py

@@ -11,15 +11,15 @@
 #  GNU General Public License for more details.
 #
 
-from gi.repository import GObject, Gtk
 from .drawing import Drawing
 from .config import Config
 
 import time
-import gi
 import logging
 
+import gi
 gi.require_version("Gtk", "3.0")
+from gi.repository import GObject, Gtk  # NOQA
 
 logger = logging.getLogger('tuhi.gui.drawingperspective')
 

tuhi/gui/window.py

@@ -11,16 +11,16 @@
 #  GNU General Public License for more details.
 #
 
-from gettext import gettext as _
-from gi.repository import Gtk, Gio, GLib, GObject
-
 from .drawingperspective import DrawingPerspective
 from .config import Config
 from tuhi.dbusclient import TuhiDBusClientManager
 
+from gettext import gettext as _
 import logging
+
 import gi
 gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk, Gio, GLib, GObject  # NOQA
 
 logger = logging.getLogger('tuhi.gui.window')