Add workarounds for isort

* Add workaround for unicodedata issue
 * Change line length to 120
 * Skip gtkui.py to stop it moving local imports above the install reactor line

deluge/core/core.py

@@ -61,8 +61,7 @@ from deluge.core.preferencesmanager import PreferencesManager
 from deluge.core.rpcserver import export
 from deluge.core.torrentmanager import TorrentManager
 from deluge.error import DelugeError, InvalidPathError, InvalidTorrentError
-from deluge.event import (NewVersionAvailableEvent, SessionPausedEvent, SessionResumedEvent,
+from deluge.event import NewVersionAvailableEvent, SessionPausedEvent, SessionResumedEvent, TorrentQueueChangedEvent
-                          TorrentQueueChangedEvent)
 from deluge.httpdownloader import download_file
 
 log = logging.getLogger(__name__)

deluge/core/rpcserver.py

@@ -49,8 +49,7 @@ from twisted.internet.protocol import Factory
 import deluge.component as component
 import deluge.configmanager
 from deluge.core.authmanager import AUTH_LEVEL_ADMIN, AUTH_LEVEL_DEFAULT, AUTH_LEVEL_NONE
-from deluge.error import (_ClientSideRecreateError, DelugeError, IncompatibleClient, NotAuthorizedError,
+from deluge.error import _ClientSideRecreateError, DelugeError, IncompatibleClient, NotAuthorizedError, WrappedException
-                          WrappedException)
 from deluge.transfer import DelugeTransferProtocol
 
 RPC_RESPONSE = 1

deluge/core/torrentmanager.py

@@ -27,9 +27,9 @@ from deluge.configmanager import ConfigManager, get_config_dir
 from deluge.core.authmanager import AUTH_LEVEL_ADMIN
 from deluge.core.torrent import sanitize_filepath, Torrent, TorrentOptions
 from deluge.error import InvalidTorrentError
-from deluge.event import (PreTorrentRemovedEvent, SessionStartedEvent, TorrentAddedEvent,
+from deluge.event import (PreTorrentRemovedEvent, SessionStartedEvent, TorrentAddedEvent, TorrentFileCompletedEvent,
-                          TorrentFileCompletedEvent, TorrentFileRenamedEvent, TorrentFinishedEvent,
+                          TorrentFileRenamedEvent, TorrentFinishedEvent, TorrentRemovedEvent, TorrentResumedEvent,
-                          TorrentRemovedEvent, TorrentResumedEvent, TorrentStateChangedEvent)
+                          TorrentStateChangedEvent)
 
 log = logging.getLogger(__name__)
 

deluge/rencode.py

@@ -64,8 +64,7 @@ __all__ = ['dumps', 'loads']
 
 import struct
 from threading import Lock
-from types import (DictType, FloatType, IntType, ListType, LongType, NoneType, StringType, TupleType,
+from types import DictType, FloatType, IntType, ListType, LongType, NoneType, StringType, TupleType, UnicodeType
-                   UnicodeType)
 
 # Default number of bits for serialized floats, either 32 or 64 (also a parameter for dumps()).
 DEFAULT_FLOAT_BITS = 32

deluge/ui/console/modes/format_utils.py

@@ -9,11 +9,11 @@
 
 import re
 from collections import deque
-
-import deluge.common
 from unicodedata import normalize as ud_normalize
 from unicodedata import east_asian_width
 
+import deluge.common
+
 
 def format_speed(speed):
     if (speed > 0):

deluge/ui/console/modes/preferences.py

@@ -15,9 +15,8 @@ from deluge.ui.client import client
 from deluge.ui.console.basemode import BaseMode
 from deluge.ui.console.input_popup import Popup, SelectInput
 from deluge.ui.console.popup import MessagePopup
-from deluge.ui.console.preference_panes import (BandwidthPane, CachePane, ColumnsPane, DaemonPane,
+from deluge.ui.console.preference_panes import (BandwidthPane, CachePane, ColumnsPane, DaemonPane, DownloadsPane,
-                                                DownloadsPane, InterfacePane, NetworkPane, OtherPane,
+                                                InterfacePane, NetworkPane, OtherPane, ProxyPane, QueuePane)
-                                                ProxyPane, QueuePane)
 
 try:
     import curses

setup.cfg

@@ -18,3 +18,8 @@ frameworks = CoreFoundation, Foundation, AppKit
 max-line-length = 120
 builtins = _
 ignore = N802
+
+[isort]
+known_standard_library=unicodedata
+line_length=120
+skip=gtkui.py

win32/deluge-bbfreeze.py

@@ -1,10 +1,14 @@
-import os, glob, sys
+import glob
+import os
 import shutil
+import sys
+
 import gtk
-import icon
+
-from bbfreeze import Freezer
 import bbfreeze.recipes
 import deluge.common
+import icon
+from bbfreeze import Freezer
 
 # Get build_version from installed deluge
 build_version = deluge.common.get_version()

win32/icon.py

@@ -24,6 +24,7 @@ LOAD_LIBRARY_AS_DATAFILE = 2
 
 import struct
 import types
+
 try:
     StringTypes = types.StringTypes
 except AttributeError: