diff --git a/deluge/core/daemon.py b/deluge/core/daemon.py index cb477727af..ef06cc0747 100644 --- a/deluge/core/daemon.py +++ b/deluge/core/daemon.py @@ -18,7 +18,7 @@ from deluge.common import get_version, is_ip, windows_check from deluge.configmanager import get_config_dir from deluge.core.core import Core -from deluge.core.rpcserver import export, RPCServer +from deluge.core.rpcserver import RPCServer, export from deluge.error import DaemonRunningError if windows_check(): diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index a1e30bec5a..5ed1ab8da2 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -16,14 +16,14 @@ import traceback from types import FunctionType -from OpenSSL import crypto, SSL +from OpenSSL import SSL, crypto from twisted.internet import defer, reactor 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 DelugeError, IncompatibleClient, NotAuthorizedError, WrappedException, _ClientSideRecreateError from deluge.transfer import DelugeTransferProtocol RPC_RESPONSE = 1 diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index f6d611ed43..79d1ca9c7a 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -25,7 +25,7 @@ from deluge.common import decode_string, get_magnet_info, utf8_encoded 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.core.torrent import Torrent, TorrentOptions, sanitize_filepath from deluge.error import InvalidTorrentError from deluge.event import (PreTorrentRemovedEvent, SessionStartedEvent, TorrentAddedEvent, TorrentFileCompletedEvent, TorrentFileRenamedEvent, TorrentFinishedEvent, TorrentRemovedEvent, TorrentResumedEvent, diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py index 2f44e86c28..234d2251cd 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py @@ -19,7 +19,7 @@ import shutil from twisted.internet import reactor -from twisted.internet.task import deferLater, LoopingCall +from twisted.internet.task import LoopingCall, deferLater import deluge.component as component import deluge.configmanager diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py index 6a58458e31..e13fa0d794 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py @@ -27,8 +27,8 @@ from deluge.httpdownloader import download_file from deluge.plugins.pluginbase import CorePluginBase -from .common import BadIP, IP -from .detect import create_reader, detect_compression, detect_format, UnknownFormatError +from .common import IP, BadIP +from .detect import UnknownFormatError, create_reader, detect_compression, detect_format from .readers import ReaderParseError # TODO: check return values for deferred callbacks diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py index e73b93de8f..724efeb7f7 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py @@ -10,7 +10,7 @@ import logging import re -from .common import BadIP, IP, raises_errors_as +from .common import IP, BadIP, raises_errors_as log = logging.getLogger(__name__) diff --git a/deluge/tests/test_client.py b/deluge/tests/test_client.py index 7a0ed2045a..94ef34ce60 100644 --- a/deluge/tests/test_client.py +++ b/deluge/tests/test_client.py @@ -4,7 +4,7 @@ from deluge import error from deluge.core.authmanager import AUTH_LEVEL_ADMIN -from deluge.ui.client import Client, client, DaemonSSLProxy +from deluge.ui.client import Client, DaemonSSLProxy, client from . import common diff --git a/deluge/tests/test_common.py b/deluge/tests/test_common.py index ac42812b74..3b4c0f7103 100644 --- a/deluge/tests/test_common.py +++ b/deluge/tests/test_common.py @@ -2,8 +2,8 @@ from twisted.trial import unittest -from deluge.common import (fdate, fpcnt, fpeer, fsize, fspeed, ftime, get_path_size, is_ip, is_magnet, is_url, - setup_translations, VersionSplit) +from deluge.common import (VersionSplit, fdate, fpcnt, fpeer, fsize, fspeed, ftime, get_path_size, is_ip, is_magnet, + is_url, setup_translations) class CommonTestCase(unittest.TestCase): diff --git a/deluge/ui/console/commands/status.py b/deluge/ui/console/commands/status.py index 80060b20eb..5077a72310 100644 --- a/deluge/ui/console/commands/status.py +++ b/deluge/ui/console/commands/status.py @@ -12,7 +12,7 @@ from twisted.internet import defer import deluge.component as component -from deluge.common import fspeed, TORRENT_STATE +from deluge.common import TORRENT_STATE, fspeed from deluge.ui.client import client from deluge.ui.console.main import BaseCommand diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 7043ba394e..a5738b20e1 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -23,7 +23,7 @@ import deluge.common import deluge.component as component from deluge.ui.client import client -from deluge.ui.console import colors, UI_PATH +from deluge.ui.console import UI_PATH, colors from deluge.ui.console.eventlog import EventLog from deluge.ui.console.statusbars import StatusBars from deluge.ui.coreconfig import CoreConfig diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index d509bfbdc1..ca32f4ff8d 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -12,7 +12,7 @@ from sys import maxint import deluge.component as component -from deluge.common import fdate, FILE_PRIORITY, fsize, ftime +from deluge.common import FILE_PRIORITY, fdate, fsize, ftime from deluge.ui.client import client from deluge.ui.console import colors from deluge.ui.console.modes import format_utils diff --git a/deluge/ui/gtkui/filtertreeview.py b/deluge/ui/gtkui/filtertreeview.py index b8678172d7..0453c9c4ce 100644 --- a/deluge/ui/gtkui/filtertreeview.py +++ b/deluge/ui/gtkui/filtertreeview.py @@ -18,7 +18,7 @@ from gobject import GError import deluge.component as component -from deluge.common import get_pixmap, resource_filename, TORRENT_STATE +from deluge.common import TORRENT_STATE, get_pixmap, resource_filename from deluge.configmanager import ConfigManager from deluge.ui.client import client diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index 13c67821fd..7c95a8f1bd 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -11,7 +11,7 @@ import gtk import pygtk -from gobject import signal_new, SIGNAL_RUN_LAST, TYPE_NONE +from gobject import SIGNAL_RUN_LAST, TYPE_NONE, signal_new from deluge.ui.gtkui.common import load_pickled_state_file, save_pickled_state_file diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 0b913eb59c..8ec1acc71e 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -23,7 +23,7 @@ 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 compress, Template +from deluge.ui.web.common import Template, compress from deluge.ui.web.json_api import JSON, WebApi from deluge.ui.web.pluginmanager import PluginManager diff --git a/setup.cfg b/setup.cfg index 289e449d3d..d01c4672c7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,3 +19,4 @@ known_standard_library=unicodedata line_length=120 skip=gtkui.py known_third_party=pygtk,gtk,gobject,gtk.gdk,pango,cairo,pangocairo +order_by_type=true diff --git a/tox.ini b/tox.ini index f4a78741cc..12bdf675ca 100644 --- a/tox.ini +++ b/tox.ini @@ -71,7 +71,7 @@ deps = whitelist_externals = {[testenv]whitelist_externals} isort -commands = python -c "import subprocess, sys; output = subprocess.check_output('isort --recursive --diff --stdout deluge docs win32 *.py', shell=True); print output; sys.exit(len(output) != 0)" +commands = python -c "import subprocess, sys; output = subprocess.check_output('isort --stdout --diff --recursive deluge docs win32 *.py', shell=True); print output; sys.exit(len(output) != 0)" [testenv:flake8] setenv = {[testenv]setenv}