7 files changed, 18 insertions, 18 deletions
diff --git a/deluge/ui/console/cmdline/commands/add.py b/deluge/ui/console/cmdline/commands/add.py
index e063d488f..da42695b5 100644
--- a/deluge/ui/console/cmdline/commands/add.py
+++ b/deluge/ui/console/cmdline/commands/add.py
@@ -26,8 +26,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
 
 
 class Command(BaseCommand):
diff --git a/deluge/ui/console/cmdline/commands/plugin.py b/deluge/ui/console/cmdline/commands/plugin.py
index fafc77afd..72cecb40f 100644
--- a/deluge/ui/console/cmdline/commands/plugin.py
+++ b/deluge/ui/console/cmdline/commands/plugin.py
@@ -106,8 +106,8 @@ class Command(BaseCommand):
 
         elif options.install:
             import os.path
-            from base64 import b64encode
             import shutil
+            from base64 import b64encode
 
             filepath = options.install
 
diff --git a/deluge/ui/console/console.py b/deluge/ui/console/console.py
index 58d31d514..f683c749d 100644
--- a/deluge/ui/console/console.py
+++ b/deluge/ui/console/console.py
@@ -112,9 +112,9 @@ class Console(UI):
         )
         # To properly print help message for the console commands ( e.g. deluge-console info -h),
         # we add a subparser for each command which will trigger the help/usage when given
-        from deluge.ui.console.parser import (
+        from deluge.ui.console.parser import (  # import here because (see top)
             ConsoleCommandParser,
-        )  # import here because (see top)
+        )
 
         self.console_parser = ConsoleCommandParser(
             parents=[self.parser],
diff --git a/deluge/ui/console/modes/basemode.py b/deluge/ui/console/modes/basemode.py
index dd3681f5b..5520b0b46 100644
--- a/deluge/ui/console/modes/basemode.py
+++ b/deluge/ui/console/modes/basemode.py
@@ -26,9 +26,9 @@ except ImportError:
 
 try:
     import signal
-    from fcntl import ioctl
-    import termios
     import struct
+    import termios
+    from fcntl import ioctl
 except ImportError:
     pass
 
diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py
index d02a0d396..fbb4fa55f 100644
--- a/deluge/ui/console/modes/torrentdetail.py
+++ b/deluge/ui/console/modes/torrentdetail.py
@@ -220,7 +220,7 @@ class TorrentDetail(BaseMode, PopupsHandler):
         self.refresh()
 
     def build_file_list(self, torrent_files, progress, priority):
-        """ Split file list from torrent state into a directory tree.
+        """Split file list from torrent state into a directory tree.
 
         Returns:
 
diff --git a/deluge/ui/console/parser.py b/deluge/ui/console/parser.py
index 27f248564..1c0bd7009 100644
--- a/deluge/ui/console/parser.py
+++ b/deluge/ui/console/parser.py
@@ -60,14 +60,14 @@ class ConsoleCommandParser(ConsoleBaseParser):
     def parse_args(self, args=None):
         """Parse known UI args and handle common and process group options.
 
-            Notes:
-                If started by deluge entry script this has already been done.
+        Notes:
+            If started by deluge entry script this has already been done.
 
-            Args:
-                args (list, optional): The arguments to parse.
+        Args:
+            args (list, optional): The arguments to parse.
 
-            Returns:
-                argparse.Namespace: The parsed arguments.
+        Returns:
+            argparse.Namespace: The parsed arguments.
         """
         from deluge.ui.ui_entry import AMBIGUOUS_CMD_ARGS
 
@@ -118,9 +118,9 @@ class OptionParser(ConsoleBaseParser):
     def error(self, msg):
         """error(msg : string)
 
-           Print a usage message incorporating 'msg' to stderr and exit.
-           If you override this in a subclass, it should not return -- it
-           should either exit or raise an exception.
+        Print a usage message incorporating 'msg' to stderr and exit.
+        If you override this in a subclass, it should not return -- it
+        should either exit or raise an exception.
         """
         raise OptionParserError(msg)
 
diff --git a/deluge/ui/console/widgets/fields.py b/deluge/ui/console/widgets/fields.py
index 1966c6685..021cab738 100644
--- a/deluge/ui/console/widgets/fields.py
+++ b/deluge/ui/console/widgets/fields.py
@@ -1061,9 +1061,9 @@ class ComboInput(InputField):
                     # No match, so start at beginning
                     select_in_range(0, selected)
 
-            from deluge.ui.console.widgets.popup import (
+            from deluge.ui.console.widgets.popup import (  # Must import here
                 SelectablePopup,
-            )  # Must import here
+            )
 
             select_popup = SelectablePopup(
                 self.parent,