8 files changed, 15 insertions, 15 deletions
diff --git a/deluge/ui/gtk3/__init__.py b/deluge/ui/gtk3/__init__.py
index 3b9d2b123..1d9b5b89d 100644
--- a/deluge/ui/gtk3/__init__.py
+++ b/deluge/ui/gtk3/__init__.py
@@ -40,9 +40,10 @@ class Gtk(UI):
 
     def start(self):
         super(Gtk, self).start()
-        from .gtkui import GtkUI
         import deluge.common
 
+        from .gtkui import GtkUI
+
         def run(options):
             try:
                 gtkui = GtkUI(options)
diff --git a/deluge/ui/gtk3/dialogs.py b/deluge/ui/gtk3/dialogs.py
index deea10515..4a2a60a7e 100644
--- a/deluge/ui/gtk3/dialogs.py
+++ b/deluge/ui/gtk3/dialogs.py
@@ -159,8 +159,8 @@ class ErrorDialog(BaseDialog):
         )
 
         if traceback:
-            import traceback
             import sys
+            import traceback
 
             tb = sys.exc_info()
             tb = traceback.format_exc(tb[2])
diff --git a/deluge/ui/gtk3/gtkui.py b/deluge/ui/gtk3/gtkui.py
index 47e889c6e..d8d335866 100644
--- a/deluge/ui/gtk3/gtkui.py
+++ b/deluge/ui/gtk3/gtkui.py
@@ -75,7 +75,7 @@ set_prgname('deluge')
 log = logging.getLogger(__name__)
 
 try:
-    from setproctitle import setproctitle, getproctitle
+    from setproctitle import getproctitle, setproctitle
 except ImportError:
 
     def setproctitle(title):
diff --git a/deluge/ui/gtk3/ipcinterface.py b/deluge/ui/gtk3/ipcinterface.py
index dc51a8716..78858c443 100644
--- a/deluge/ui/gtk3/ipcinterface.py
+++ b/deluge/ui/gtk3/ipcinterface.py
@@ -31,8 +31,8 @@ try:
     from urllib.request import url2pathname
 except ImportError:
     # PY2 fallback
-    from urlparse import urlparse  # pylint: disable=ungrouped-imports
     from urllib import url2pathname  # pylint: disable=ungrouped-imports
+    from urlparse import urlparse  # pylint: disable=ungrouped-imports
 
 log = logging.getLogger(__name__)
 
@@ -84,8 +84,8 @@ class IPCInterface(component.Component):
         if windows_check():
             # If we're on windows we need to check the global mutex to see if deluge is
             # already running.
-            import win32event
             import win32api
+            import win32event
             import winerror
 
             self.mutex = win32event.CreateMutex(None, False, 'deluge')
diff --git a/deluge/ui/gtk3/listview.py b/deluge/ui/gtk3/listview.py
index 666bb6731..7b1cba810 100644
--- a/deluge/ui/gtk3/listview.py
+++ b/deluge/ui/gtk3/listview.py
@@ -68,10 +68,10 @@ class ListView(object):
 
     class TreeviewColumn(Gtk.TreeViewColumn, object):
         """
-            TreeViewColumn does not signal right-click events, and we need them
-            This subclass is equivalent to TreeViewColumn, but it signals these events
+        TreeViewColumn does not signal right-click events, and we need them
+        This subclass is equivalent to TreeViewColumn, but it signals these events
 
-            Most of the code of this class comes from Quod Libet (http://www.sacredchao.net/quodlibet)
+        Most of the code of this class comes from Quod Libet (http://www.sacredchao.net/quodlibet)
         """
 
         __gsignals__ = {
@@ -281,7 +281,7 @@ class ListView(object):
 
     def save_state(self, filename):
         """Saves the listview state (column positions and visibility) to
-            filename."""
+        filename."""
         # A list of ListViewColumnStates
         state = []
 
@@ -627,8 +627,7 @@ class ListView(object):
         unique=False,
         default_sort=False,
     ):
-        """Add a text column to the listview.  Only the header name is required.
-        """
+        """Add a text column to the listview.  Only the header name is required."""
         render = Gtk.CellRendererText()
         self.add_column(
             header,
diff --git a/deluge/ui/gtk3/peers_tab.py b/deluge/ui/gtk3/peers_tab.py
index fa79d84a1..e0282becf 100644
--- a/deluge/ui/gtk3/peers_tab.py
+++ b/deluge/ui/gtk3/peers_tab.py
@@ -305,8 +305,8 @@ class PeersTab(Tab):
                     peer_ip = peer['ip']
                 else:
                     # This is an IPv6 address
-                    import socket
                     import binascii
+                    import socket
 
                     # Split out the :port
                     ip = ':'.join(peer['ip'].split(':')[:-1])
diff --git a/deluge/ui/gtk3/preferences.py b/deluge/ui/gtk3/preferences.py
index b4d3f521c..a4d63aaa8 100644
--- a/deluge/ui/gtk3/preferences.py
+++ b/deluge/ui/gtk3/preferences.py
@@ -1180,8 +1180,8 @@ class Preferences(component.Component):
             chooser.destroy()
             return
 
-        from base64 import b64encode
         import shutil
+        from base64 import b64encode
 
         filename = os.path.split(filepath)[1]
         shutil.copyfile(filepath, os.path.join(get_config_dir(), 'plugins', filename))
diff --git a/deluge/ui/gtk3/torrentdetails.py b/deluge/ui/gtk3/torrentdetails.py
index 29e019326..b2124b309 100644
--- a/deluge/ui/gtk3/torrentdetails.py
+++ b/deluge/ui/gtk3/torrentdetails.py
@@ -112,11 +112,11 @@ class TorrentDetails(component.Component):
         self.tabs = {}
 
         # Add the default tabs
-        from .status_tab import StatusTab
         from .details_tab import DetailsTab
         from .files_tab import FilesTab
-        from .peers_tab import PeersTab
         from .options_tab import OptionsTab
+        from .peers_tab import PeersTab
+        from .status_tab import StatusTab
         from .trackers_tab import TrackersTab
 
         default_tabs = {