Sort/prettify imports with isort

6 files changed, 27 insertions, 26 deletions

diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py
index 93912411c..3bf4e2b92 100644
--- a/deluge/ui/web/auth.py
+++ b/deluge/ui/web/auth.py
@@ -7,10 +7,10 @@
 # See LICENSE for more details.
 #
 
-import time
-import random
 import hashlib
 import logging
+import random
+import time
 from datetime import datetime, timedelta
 from email.utils import formatdate
 
@@ -18,6 +18,7 @@ from twisted.internet.task import LoopingCall
 
 from deluge import component
 from deluge.common import utf8_encoded
+from deluge.ui.web.json_api import export, JSONComponent
 
 log = logging.getLogger(__name__)
 
@@ -38,7 +39,6 @@ class AuthError(Exception):
     pass
 
 # Import after as json_api imports the above AuthError and AUTH_LEVEL_DEFAULT
-from deluge.ui.web.json_api import JSONComponent, export
 
 
 def make_checksum(session_id):
diff --git a/deluge/ui/web/common.py b/deluge/ui/web/common.py
index 8f39141c8..0acd16d5b 100644
--- a/deluge/ui/web/common.py
+++ b/deluge/ui/web/common.py
@@ -7,8 +7,9 @@
 # See LICENSE for more details.
 #
 
-import zlib
 import gettext
+import zlib
+
 from deluge import common
 
 _ = lambda x: gettext.gettext(x).decode("utf-8")
diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py
index 4d8472435..9b435819b 100644
--- a/deluge/ui/web/json_api.py
+++ b/deluge/ui/web/json_api.py
@@ -7,32 +7,31 @@
 # See LICENSE for more details.
 #
 
-import os
-import time
 import base64
-import shutil
-import logging
 import hashlib
-import tempfile
 import json
-from urlparse import urljoin
+import logging
+import os
+import shutil
+import tempfile
+import time
+from types import FunctionType
 from urllib import unquote_plus
+from urlparse import urljoin
 
-from types import FunctionType
+import twisted.web.client
+import twisted.web.error
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred, DeferredList
 from twisted.web import http, resource, server
-import twisted.web.client
-import twisted.web.error
 
-from deluge.common import is_magnet
 from deluge import component, httpdownloader
+from deluge.common import is_magnet
 from deluge.configmanager import ConfigManager, get_config_dir
 from deluge.ui import common as uicommon
-from deluge.ui.client import client, Client
+from deluge.ui.client import Client, client
 from deluge.ui.coreconfig import CoreConfig
 from deluge.ui.sessionproxy import SessionProxy
-
 from deluge.ui.web.common import _, compress
 
 log = logging.getLogger(__name__)
diff --git a/deluge/ui/web/pluginmanager.py b/deluge/ui/web/pluginmanager.py
index b30fba8ae..29204c79b 100644
--- a/deluge/ui/web/pluginmanager.py
+++ b/deluge/ui/web/pluginmanager.py
@@ -7,13 +7,13 @@
 # See LICENSE for more details.
 #
 
-import os
 import logging
+import os
 
 from deluge import component
+from deluge.configmanager import ConfigManager
 from deluge.pluginmanagerbase import PluginManagerBase
 from deluge.ui.client import client
-from deluge.configmanager import ConfigManager
 
 log = logging.getLogger(__name__)
 
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index 85aabc215..6fd61630d 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -7,15 +7,15 @@
 # See LICENSE for more details.
 #
 
-import os
 import fnmatch
+import json
 import logging
-import tempfile
 import mimetypes
-import json
+import os
+import tempfile
 
-from twisted.application import service, internet
-from twisted.internet import reactor, defer, error
+from twisted.application import internet, service
+from twisted.internet import defer, error, reactor
 from twisted.internet.ssl import SSL
 from twisted.web import http, resource, server, static
 
@@ -23,7 +23,7 @@ from deluge import common, component, configmanager
 from deluge.core.rpcserver import check_ssl_keys
 from deluge.ui.tracker_icons import TrackerIcons
 from deluge.ui.web.auth import Auth
-from deluge.ui.web.common import Template, compress
+from deluge.ui.web.common import compress, Template
 from deluge.ui.web.json_api import JSON, WebApi
 from deluge.ui.web.pluginmanager import PluginManager
 
diff --git a/deluge/ui/web/web.py b/deluge/ui/web/web.py
index fecb722ea..c46620ff4 100644
--- a/deluge/ui/web/web.py
+++ b/deluge/ui/web/web.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
@@ -8,11 +7,13 @@ from __future__ import print_function
 # See LICENSE for more details.
 #
 
+from __future__ import print_function
+
 import os
+from optparse import OptionGroup
 
 import deluge.common
 from deluge.ui.ui import _UI, UI
-from optparse import OptionGroup
 
 
 class WebUI(UI):