From d0b8e17873328adbd7ac767a875a2a80fa7c5591 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Fri, 19 Sep 2014 15:43:21 +0100 Subject: [PATCH] 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 | 3 +-- deluge/core/rpcserver.py | 3 +-- deluge/core/torrentmanager.py | 6 +++--- deluge/rencode.py | 3 +-- deluge/ui/console/modes/format_utils.py | 4 ++-- deluge/ui/console/modes/preferences.py | 5 ++--- setup.cfg | 5 +++++ win32/deluge-bbfreeze.py | 10 +++++++--- win32/icon.py | 1 + 9 files changed, 23 insertions(+), 17 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index 2512fcff2..54584a804 100644 --- a/deluge/core/core.py +++ b/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, - TorrentQueueChangedEvent) +from deluge.event import NewVersionAvailableEvent, SessionPausedEvent, SessionResumedEvent, TorrentQueueChangedEvent from deluge.httpdownloader import download_file log = logging.getLogger(__name__) diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 3553c24aa..1523b7781 100644 --- a/deluge/core/rpcserver.py +++ b/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, - WrappedException) +from deluge.error import _ClientSideRecreateError, DelugeError, IncompatibleClient, NotAuthorizedError, WrappedException from deluge.transfer import DelugeTransferProtocol RPC_RESPONSE = 1 diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 72164deec..897dfb579 100644 --- a/deluge/core/torrentmanager.py +++ b/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, - TorrentFileCompletedEvent, TorrentFileRenamedEvent, TorrentFinishedEvent, - TorrentRemovedEvent, TorrentResumedEvent, TorrentStateChangedEvent) +from deluge.event import (PreTorrentRemovedEvent, SessionStartedEvent, TorrentAddedEvent, TorrentFileCompletedEvent, + TorrentFileRenamedEvent, TorrentFinishedEvent, TorrentRemovedEvent, TorrentResumedEvent, + TorrentStateChangedEvent) log = logging.getLogger(__name__) diff --git a/deluge/rencode.py b/deluge/rencode.py index d4b73fd72..5d638005e 100644 --- a/deluge/rencode.py +++ b/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, - UnicodeType) +from types import DictType, FloatType, IntType, ListType, LongType, NoneType, StringType, TupleType, UnicodeType # Default number of bits for serialized floats, either 32 or 64 (also a parameter for dumps()). DEFAULT_FLOAT_BITS = 32 diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 96f89b18a..c1bb74aa5 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/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): diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index 8321d6540..b14244877 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/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, - DownloadsPane, InterfacePane, NetworkPane, OtherPane, - ProxyPane, QueuePane) +from deluge.ui.console.preference_panes import (BandwidthPane, CachePane, ColumnsPane, DaemonPane, DownloadsPane, + InterfacePane, NetworkPane, OtherPane, ProxyPane, QueuePane) try: import curses diff --git a/setup.cfg b/setup.cfg index 8f9a533af..ba2d1ea01 100644 --- a/setup.cfg +++ b/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 diff --git a/win32/deluge-bbfreeze.py b/win32/deluge-bbfreeze.py index 0dcd1e48e..c759a65fa 100644 --- a/win32/deluge-bbfreeze.py +++ b/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() diff --git a/win32/icon.py b/win32/icon.py index 0b9593928..ef84a8950 100644 --- a/win32/icon.py +++ b/win32/icon.py @@ -24,6 +24,7 @@ LOAD_LIBRARY_AS_DATAFILE = 2 import struct import types + try: StringTypes = types.StringTypes except AttributeError: