diff options
author | Calum Lind <calumlind+deluge@gmail.com> | 2014-09-03 18:18:29 +0100 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2014-09-03 18:27:32 +0100 |
commit | b5dcfc6f9e0b3397ceab3bec354fdc94b48b27ef (patch) | |
tree | c24ce802fe75af4e0ffac48a8dddbd66648bae1d /deluge/ui | |
parent | 1ca08ccf95f79494c1ac01326e73671a7a022f80 (diff) | |
download | deluge-b5dcfc6f9e0b3397ceab3bec354fdc94b48b27ef.tar.gz deluge-b5dcfc6f9e0b3397ceab3bec354fdc94b48b27ef.tar.bz2 deluge-b5dcfc6f9e0b3397ceab3bec354fdc94b48b27ef.zip |
Sort/prettify imports with isort
Diffstat (limited to 'deluge/ui')
84 files changed, 471 insertions, 414 deletions
diff --git a/deluge/ui/Win32IconImagePlugin.py b/deluge/ui/Win32IconImagePlugin.py index 3f6c77119..ae6c6c3e7 100644 --- a/deluge/ui/Win32IconImagePlugin.py +++ b/deluge/ui/Win32IconImagePlugin.py @@ -46,13 +46,13 @@ Example icon to test with `down.ico`_ import logging import struct + +import PIL.BmpImagePlugin import PIL.Image import PIL.ImageChops import PIL.ImageFile -import PIL.BmpImagePlugin import PIL.PngImagePlugin - _MAGIC = '\0\0\1\0' log = logging.getLogger(__name__) diff --git a/deluge/ui/client.py b/deluge/ui/client.py index f858b4b96..9472e0349 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -35,10 +35,11 @@ # import logging -from twisted.internet.protocol import ClientFactory -from twisted.internet import reactor, ssl, defer -import sys import subprocess +import sys + +from twisted.internet import defer, reactor, ssl +from twisted.internet.protocol import ClientFactory import deluge.common from deluge import error diff --git a/deluge/ui/common.py b/deluge/ui/common.py index 6722550b7..97755837d 100644 --- a/deluge/ui/common.py +++ b/deluge/ui/common.py @@ -38,13 +38,13 @@ The ui common module contains methods and classes that are deemed useful for all the interfaces. """ -import os import logging +import os from hashlib import sha1 as sha -from deluge import bencode -from deluge.common import utf8_encoded, path_join import deluge.configmanager +from deluge import bencode +from deluge.common import path_join, utf8_encoded log = logging.getLogger(__name__) diff --git a/deluge/ui/console/commander.py b/deluge/ui/console/commander.py index 676615ccd..942932140 100644 --- a/deluge/ui/console/commander.py +++ b/deluge/ui/console/commander.py @@ -1,4 +1,3 @@ -from __future__ import print_function # # commander.py # @@ -35,14 +34,19 @@ from __future__ import print_function # statement from all source files in the program, then also delete it here. # # + +from __future__ import print_function + +import logging import sys + from twisted.internet import defer + import deluge.component as component +from colors import strip_colors from deluge.error import DelugeError from deluge.ui.client import client -from colors import strip_colors -import logging log = logging.getLogger(__name__) diff --git a/deluge/ui/console/commands/add.py b/deluge/ui/console/commands/add.py index e684a959d..3b3db9214 100644 --- a/deluge/ui/console/commands/add.py +++ b/deluge/ui/console/commands/add.py @@ -8,19 +8,19 @@ # See LICENSE for more details. # -from twisted.internet import defer - -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -import deluge.component as component -import deluge.common - -from optparse import make_option -import os import base64 +import os +from optparse import make_option from urllib import url2pathname from urlparse import urlparse +from twisted.internet import defer + +import deluge.common +import deluge.component as component +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """Add a torrent""" diff --git a/deluge/ui/console/commands/cache.py b/deluge/ui/console/commands/cache.py index 92c016d9f..d101c6ed6 100644 --- a/deluge/ui/console/commands/cache.py +++ b/deluge/ui/console/commands/cache.py @@ -32,10 +32,11 @@ # statement from all source files in the program, then also delete it here. # -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -import deluge.ui.console.colors as colors import deluge.component as component +import deluge.ui.console.colors as colors +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """Show information about the disk cache""" diff --git a/deluge/ui/console/commands/config.py b/deluge/ui/console/commands/config.py index b72092c5f..99cafbe2f 100644 --- a/deluge/ui/console/commands/config.py +++ b/deluge/ui/console/commands/config.py @@ -34,18 +34,18 @@ # # -import re +import cStringIO import logging +import re import tokenize -import cStringIO from optparse import make_option from twisted.internet import defer -from deluge.ui.console.main import BaseCommand +import deluge.component as component import deluge.ui.console.colors as colors from deluge.ui.client import client -import deluge.component as component +from deluge.ui.console.main import BaseCommand log = logging.getLogger(__name__) diff --git a/deluge/ui/console/commands/connect.py b/deluge/ui/console/commands/connect.py index da3922ee7..f969c269b 100644 --- a/deluge/ui/console/commands/connect.py +++ b/deluge/ui/console/commands/connect.py @@ -33,10 +33,11 @@ # statement from all source files in the program, then also delete it here. # # -from deluge.ui.console.main import BaseCommand +import deluge.component as component import deluge.ui.console.colors as colors from deluge.ui.client import client -import deluge.component as component +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """Connect to a new deluge server.""" diff --git a/deluge/ui/console/commands/debug.py b/deluge/ui/console/commands/debug.py index 40e87eda2..5fa409058 100644 --- a/deluge/ui/console/commands/debug.py +++ b/deluge/ui/console/commands/debug.py @@ -36,11 +36,12 @@ from twisted.internet import defer -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -import deluge.ui.console.colors as colors -import deluge.log import deluge.component as component +import deluge.log +import deluge.ui.console.colors as colors +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """Enable and disable debugging""" diff --git a/deluge/ui/console/commands/gui.py b/deluge/ui/console/commands/gui.py index 320f485be..7021da3a6 100644 --- a/deluge/ui/console/commands/gui.py +++ b/deluge/ui/console/commands/gui.py @@ -32,11 +32,12 @@ # statement from all source files in the program, then also delete it here. # -from deluge.ui.console.main import BaseCommand import deluge.common import deluge.component as component +from deluge.ui.console.main import BaseCommand from deluge.ui.console.modes.alltorrents import AllTorrents + class Command(BaseCommand): """Exit this mode and go into the more 'gui' like mode""" usage = "Usage: gui" diff --git a/deluge/ui/console/commands/halt.py b/deluge/ui/console/commands/halt.py index c79eee58d..0bd9708ad 100644 --- a/deluge/ui/console/commands/halt.py +++ b/deluge/ui/console/commands/halt.py @@ -33,10 +33,11 @@ # statement from all source files in the program, then also delete it here. # # -from deluge.ui.console.main import BaseCommand +import deluge.component as component import deluge.ui.console.colors as colors from deluge.ui.client import client -import deluge.component as component +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): "Shutdown the deluge server" diff --git a/deluge/ui/console/commands/help.py b/deluge/ui/console/commands/help.py index de8cc63b7..9e7eff4b4 100644 --- a/deluge/ui/console/commands/help.py +++ b/deluge/ui/console/commands/help.py @@ -35,9 +35,10 @@ from twisted.internet import defer -from deluge.ui.console.main import BaseCommand -import deluge.ui.console.colors as colors import deluge.component as component +import deluge.ui.console.colors as colors +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """displays help on other commands""" diff --git a/deluge/ui/console/commands/info.py b/deluge/ui/console/commands/info.py index 5282ef68a..7242eff00 100644 --- a/deluge/ui/console/commands/info.py +++ b/deluge/ui/console/commands/info.py @@ -35,17 +35,17 @@ # from optparse import make_option +from os.path import sep as dirsep -from deluge.ui.console.main import BaseCommand -import deluge.ui.console.colors as colors -from deluge.ui.client import client import deluge.common as common import deluge.component as component - +import deluge.ui.console.colors as colors +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand from deluge.ui.console.modes import format_utils + strwidth = format_utils.strwidth -from os.path import sep as dirsep STATUS_KEYS = ["state", "download_location", diff --git a/deluge/ui/console/commands/manage.py b/deluge/ui/console/commands/manage.py index ef66829d4..a026c762a 100644 --- a/deluge/ui/console/commands/manage.py +++ b/deluge/ui/console/commands/manage.py @@ -35,17 +35,16 @@ # # +import re +from optparse import make_option + from twisted.internet import defer -from deluge.ui.console.main import BaseCommand -import deluge.ui.console.colors as colors -from deluge.ui.client import client import deluge.component as component +import deluge.ui.console.colors as colors from deluge.log import LOG as log - -from optparse import make_option - -import re +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand torrent_options = { "max_download_speed": float, @@ -153,4 +152,4 @@ class Command(BaseCommand): def complete(self, line): # We use the ConsoleUI torrent tab complete method - return component.get("ConsoleUI").tab_complete_torrent(line)
\ No newline at end of file + return component.get("ConsoleUI").tab_complete_torrent(line) diff --git a/deluge/ui/console/commands/move.py b/deluge/ui/console/commands/move.py index 90cca8584..6a6f75522 100644 --- a/deluge/ui/console/commands/move.py +++ b/deluge/ui/console/commands/move.py @@ -33,12 +33,12 @@ # # -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -import deluge.component as component - import os.path +import deluge.component as component +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """Move torrents' storage location""" diff --git a/deluge/ui/console/commands/pause.py b/deluge/ui/console/commands/pause.py index 47f39a5a0..04c0f2347 100644 --- a/deluge/ui/console/commands/pause.py +++ b/deluge/ui/console/commands/pause.py @@ -33,10 +33,11 @@ # statement from all source files in the program, then also delete it here. # # -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -import deluge.ui.console.colors as colors import deluge.component as component +import deluge.ui.console.colors as colors +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """Pause a torrent""" diff --git a/deluge/ui/console/commands/plugin.py b/deluge/ui/console/commands/plugin.py index 930355dc5..c5af8b55e 100644 --- a/deluge/ui/console/commands/plugin.py +++ b/deluge/ui/console/commands/plugin.py @@ -32,15 +32,15 @@ # statement from all source files in the program, then also delete it here. # # +import re from optparse import make_option -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -import deluge.ui.console.colors as colors import deluge.component as component import deluge.configmanager +import deluge.ui.console.colors as colors +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand -import re class Command(BaseCommand): """Manage plugins with this command""" diff --git a/deluge/ui/console/commands/quit.py b/deluge/ui/console/commands/quit.py index 210b9a64d..09da2fe2b 100644 --- a/deluge/ui/console/commands/quit.py +++ b/deluge/ui/console/commands/quit.py @@ -33,9 +33,11 @@ # statement from all source files in the program, then also delete it here. # # +from twisted.internet import error, reactor + from deluge.ui.client import client from deluge.ui.console.main import BaseCommand -from twisted.internet import reactor, error + class Command(BaseCommand): """Exit from the client.""" diff --git a/deluge/ui/console/commands/recheck.py b/deluge/ui/console/commands/recheck.py index 2e9cc75f1..f5c9d7564 100644 --- a/deluge/ui/console/commands/recheck.py +++ b/deluge/ui/console/commands/recheck.py @@ -32,10 +32,11 @@ # statement from all source files in the program, then also delete it here. # # -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -import deluge.ui.console.colors as colors import deluge.component as component +import deluge.ui.console.colors as colors +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """Forces a recheck of the torrent data""" diff --git a/deluge/ui/console/commands/resume.py b/deluge/ui/console/commands/resume.py index da9036240..6b9faf8a9 100644 --- a/deluge/ui/console/commands/resume.py +++ b/deluge/ui/console/commands/resume.py @@ -34,10 +34,11 @@ # # -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -import deluge.ui.console.colors as colors import deluge.component as component +import deluge.ui.console.colors as colors +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand + class Command(BaseCommand): """Resume a torrent""" diff --git a/deluge/ui/console/commands/rm.py b/deluge/ui/console/commands/rm.py index 378a78d5c..f438a219b 100644 --- a/deluge/ui/console/commands/rm.py +++ b/deluge/ui/console/commands/rm.py @@ -33,12 +33,12 @@ # statement from all source files in the program, then also delete it here. # # -from deluge.ui.console.main import BaseCommand +from optparse import make_option + +import deluge.component as component import deluge.ui.console.colors as colors from deluge.ui.client import client -import deluge.component as component - -from optparse import make_option +from deluge.ui.console.main import BaseCommand class Command(BaseCommand): diff --git a/deluge/ui/console/commands/status.py b/deluge/ui/console/commands/status.py index b5767ed1f..122a3cdb9 100644 --- a/deluge/ui/console/commands/status.py +++ b/deluge/ui/console/commands/status.py @@ -33,11 +33,13 @@ # from optparse import make_option + from twisted.internet import defer -from deluge.ui.console.main import BaseCommand -from deluge.ui.client import client -from deluge.common import fspeed, TORRENT_STATE + import deluge.component as component +from deluge.common import fspeed, TORRENT_STATE +from deluge.ui.client import client +from deluge.ui.console.main import BaseCommand class Command(BaseCommand): diff --git a/deluge/ui/console/commands/update_tracker.py b/deluge/ui/console/commands/update_tracker.py index 897ddc31a..487fc1b8e 100644 --- a/deluge/ui/console/commands/update_tracker.py +++ b/deluge/ui/console/commands/update_tracker.py @@ -33,12 +33,12 @@ # statement from all source files in the program, then also delete it here. # # -from deluge.ui.console.main import BaseCommand +from optparse import make_option + +import deluge.component as component import deluge.ui.console.colors as colors from deluge.ui.client import client -import deluge.component as component - -from optparse import make_option +from deluge.ui.console.main import BaseCommand class Command(BaseCommand): diff --git a/deluge/ui/console/eventlog.py b/deluge/ui/console/eventlog.py index 6120cd804..621dfe33f 100644 --- a/deluge/ui/console/eventlog.py +++ b/deluge/ui/console/eventlog.py @@ -35,13 +35,13 @@ import logging +import time + +import colors import deluge.component as component from deluge.common import windows_check -import colors from deluge.ui.client import client -import time - log = logging.getLogger(__name__) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 5ce8eb1ec..7d3d2546c 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -1,4 +1,3 @@ -from __future__ import print_function # # main.py # @@ -35,27 +34,28 @@ from __future__ import print_function # # -import os -import sys +from __future__ import print_function + +import locale import logging import optparse +import os import re -import locale import shlex +import sys from twisted.internet import defer, reactor +import colors +import deluge.common import deluge.component as component from deluge.ui.client import client -import deluge.common +from deluge.ui.console import UI_PATH +from deluge.ui.console.eventlog import EventLog +from deluge.ui.console.statusbars import StatusBars from deluge.ui.coreconfig import CoreConfig from deluge.ui.sessionproxy import SessionProxy -from deluge.ui.console.statusbars import StatusBars -from deluge.ui.console.eventlog import EventLog -import colors from deluge.ui.ui import _UI -from deluge.ui.console import UI_PATH - log = logging.getLogger(__name__) diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py index 37ec52b7c..dd43f7e3c 100644 --- a/deluge/ui/console/modes/add_util.py +++ b/deluge/ui/console/modes/add_util.py @@ -36,14 +36,16 @@ # statement from all source files in the program, then also delete it here. # # -from deluge.ui.client import client +import base64 +import glob +import logging +import os + +import deluge.common import deluge.component as component +from deluge.ui.client import client from deluge.ui.common import TorrentInfo -import deluge.common - -import os, base64, glob -import logging log = logging.getLogger(__name__) def __bracket_fixup(path): @@ -103,4 +105,3 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress): filedump = base64.encodestring(open(f).read()) client.core.add_torrent_file(filename, filedump, t_options).addCallback(success_cb, f, ress).addErrback(fail_cb, f, ress) - diff --git a/deluge/ui/console/modes/addtorrents.py b/deluge/ui/console/modes/addtorrents.py index d73e0ae51..3ba8fc70a 100644 --- a/deluge/ui/console/modes/addtorrents.py +++ b/deluge/ui/console/modes/addtorrents.py @@ -34,28 +34,25 @@ # # -import deluge.component as component -from basemode import BaseMode +import base64 +import logging +import os import deluge.common as common +import deluge.component as component +import deluge.ui.console.colors as colors +import format_utils +from basemode import BaseMode from deluge.ui.client import client - -import os -import base64 - from deluge.ui.sessionproxy import SessionProxy - from input_popup import InputPopup -from popup import Popup, MessagePopup -import deluge.ui.console.colors as colors -import format_utils +from popup import MessagePopup, Popup try: import curses except ImportError: pass -import logging log = logging.getLogger(__name__) # Big help string that gets displayed when the user hits 'h' diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 6252c044c..e2f038291 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -34,36 +34,34 @@ # # -import deluge.component as component -from basemode import BaseMode -import deluge.common -from deluge.ui.client import client -from deluge.configmanager import ConfigManager - +import logging from collections import deque -from deluge.ui.sessionproxy import SessionProxy +from twisted.internet import defer -from popup import Popup, SelectablePopup, MessagePopup, ALIGN +import column +import deluge.common +import deluge.component as component +import format_utils from add_util import add_torrent -from input_popup import InputPopup, ALIGN -from torrentdetail import TorrentDetail from addtorrents import AddTorrents -from preferences import Preferences -from torrent_actions import torrent_actions_popup, ACTION +from basemode import BaseMode +from deluge.configmanager import ConfigManager +from deluge.ui.client import client +from deluge.ui.sessionproxy import SessionProxy from eventview import EventView +from input_popup import ALIGN, InputPopup from legacy import Legacy - -from twisted.internet import defer - -import format_utils, column +from popup import ALIGN, MessagePopup, Popup, SelectablePopup +from preferences import Preferences +from torrent_actions import ACTION, torrent_actions_popup +from torrentdetail import TorrentDetail try: import curses except ImportError: pass -import logging log = logging.getLogger(__name__) diff --git a/deluge/ui/console/modes/basemode.py b/deluge/ui/console/modes/basemode.py index 3035be99a..fe0b3663c 100644 --- a/deluge/ui/console/modes/basemode.py +++ b/deluge/ui/console/modes/basemode.py @@ -36,15 +36,19 @@ # # -import sys import logging +import sys + +from twisted.internet import reactor + +import deluge.component as component +import deluge.ui.console.colors as colors + try: import curses except ImportError: pass -import deluge.component as component -import deluge.ui.console.colors as colors try: import signal from fcntl import ioctl @@ -53,7 +57,6 @@ try: except: pass -from twisted.internet import reactor log = logging.getLogger(__name__) diff --git a/deluge/ui/console/modes/column.py b/deluge/ui/console/modes/column.py index da1b19287..0e1f1c3e7 100644 --- a/deluge/ui/console/modes/column.py +++ b/deluge/ui/console/modes/column.py @@ -34,10 +34,11 @@ # # +import logging + import deluge.common import format_utils -import logging log = logging.getLogger(__name__) diff --git a/deluge/ui/console/modes/connectionmanager.py b/deluge/ui/console/modes/connectionmanager.py index 221ae72a2..d2fd238b0 100644 --- a/deluge/ui/console/modes/connectionmanager.py +++ b/deluge/ui/console/modes/connectionmanager.py @@ -35,28 +35,26 @@ # a mode that show's a popup to select which host to connect to -import hashlib, time - +import hashlib +import logging +import time from collections import deque -import deluge.ui.client -from deluge.ui.client import client -from deluge.configmanager import ConfigManager -from deluge.ui.coreconfig import CoreConfig import deluge.component as component - +import deluge.ui.client from alltorrents import AllTorrents from basemode import BaseMode -from popup import SelectablePopup, MessagePopup +from deluge.configmanager import ConfigManager +from deluge.ui.client import client +from deluge.ui.coreconfig import CoreConfig from input_popup import InputPopup - +from popup import MessagePopup, SelectablePopup try: import curses except ImportError: pass -import logging log = logging.getLogger(__name__) DEFAULT_HOST = "127.0.0.1" diff --git a/deluge/ui/console/modes/eventview.py b/deluge/ui/console/modes/eventview.py index df54421cd..b11f35800 100644 --- a/deluge/ui/console/modes/eventview.py +++ b/deluge/ui/console/modes/eventview.py @@ -34,9 +34,11 @@ # # +import logging + import deluge.component as component +import format_utils from basemode import BaseMode - from deluge.ui.client import client try: @@ -44,10 +46,8 @@ try: except ImportError: pass -import logging log = logging.getLogger(__name__) -import format_utils class EventView(BaseMode): def __init__(self, parent_mode, stdscr, encoding=None): diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 16fea01e0..20bc2f76e 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -34,7 +34,12 @@ # # +import re +from collections import deque + import deluge.common +from unicodedata import east_asian_width + try: import unicodedata haveud = True @@ -137,13 +142,11 @@ def format_column(col, lim): def format_row(row, column_widths): return "".join([format_column(row[i], column_widths[i]) for i in range(0, len(row))]) -import re _strip_re = re.compile("\{!.*?!\}") def remove_formatting(string): return re.sub(_strip_re, "", string) -from collections import deque def wrap_string(string,width,min_lines=0,strip_colors=True): """ Wrap a string to fit in a particular width. Returns a list of output lines. @@ -227,7 +230,6 @@ def wrap_string(string,width,min_lines=0,strip_colors=True): return ret -from unicodedata import east_asian_width def strwidth(string): """ diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 44cd8286b..86f382d8e 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -42,11 +42,12 @@ try: except ImportError: pass -import logging, os, os.path - -from popup import Popup, ALIGN +import logging +import os +import os.path from deluge.ui.console import colors +from popup import ALIGN, Popup log = logging.getLogger(__name__) @@ -909,4 +910,3 @@ class InputPopup(Popup): self.refresh() return False - diff --git a/deluge/ui/console/modes/legacy.py b/deluge/ui/console/modes/legacy.py index 46bd5871e..80d0b1895 100644 --- a/deluge/ui/console/modes/legacy.py +++ b/deluge/ui/console/modes/legacy.py @@ -41,20 +41,23 @@ except ImportError: pass -from basemode import BaseMode -import deluge.ui.console.colors as colors +import logging +import os +import re + from twisted.internet import defer, reactor -from deluge.ui.client import client + import deluge.component as component import deluge.configmanager - +import deluge.ui.console.colors as colors +from basemode import BaseMode +from deluge.ui.client import client from deluge.ui.console.modes import format_utils + strwidth = format_utils.strwidth -import logging, os log = logging.getLogger(__name__) -import re LINES_BUFFER_SIZE = 5000 INPUT_HISTORY_SIZE = 500 diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index 25fa9013b..153e47d43 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -40,8 +40,10 @@ try: except ImportError: pass -import format_utils import logging + +import format_utils + log = logging.getLogger(__name__) class ALIGN: diff --git a/deluge/ui/console/modes/preference_panes.py b/deluge/ui/console/modes/preference_panes.py index 847b6fbd7..513aac218 100644 --- a/deluge/ui/console/modes/preference_panes.py +++ b/deluge/ui/console/modes/preference_panes.py @@ -33,16 +33,18 @@ # # -from deluge.ui.console.modes.input_popup import TextInput, SelectInput, CheckedInput, IntSpinInput, FloatSpinInput, CheckedPlusInput +import logging + import deluge.ui.console.modes.alltorrents from deluge.common import is_ip +from deluge.ui.console.modes.input_popup import (CheckedInput, CheckedPlusInput, FloatSpinInput, IntSpinInput, + SelectInput, TextInput) try: import curses except ImportError: pass -import logging log = logging.getLogger(__name__) diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index cbbcb1db5..84ba79f64 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/deluge/ui/console/modes/preferences.py @@ -34,16 +34,15 @@ # # +import logging +from collections import deque + import deluge.component as component -from deluge.ui.client import client from basemode import BaseMode +from deluge.ui.client import client from input_popup import Popup, SelectInput - -from preference_panes import (DownloadsPane, NetworkPane, BandwidthPane, InterfacePane, - ColumnsPane, OtherPane, DaemonPane, QueuePane, ProxyPane, - CachePane) - -from collections import deque +from preference_panes import (BandwidthPane, CachePane, ColumnsPane, DaemonPane, DownloadsPane, InterfacePane, + NetworkPane, OtherPane, ProxyPane, QueuePane) try: import curses @@ -51,7 +50,6 @@ except ImportError: pass -import logging log = logging.getLogger(__name__) @@ -325,5 +323,3 @@ class Preferences(BaseMode): self.__actions_read(c) self.refresh() - - diff --git a/deluge/ui/console/modes/torrent_actions.py b/deluge/ui/console/modes/torrent_actions.py index cbf567471..96416b9b4 100644 --- a/deluge/ui/console/modes/torrent_actions.py +++ b/deluge/ui/console/modes/torrent_actions.py @@ -32,15 +32,16 @@ # # -from deluge.ui.client import client -from popup import SelectablePopup, Popup -from input_popup import InputPopup -import deluge.component as component +import logging -from deluge.ui.console import colors, modes from twisted.internet import defer -import logging +import deluge.component as component +from deluge.ui.client import client +from deluge.ui.console import colors, modes +from input_popup import InputPopup +from popup import Popup, SelectablePopup + log = logging.getLogger(__name__) torrent_options = [ diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 2a7cca3cb..c00c8919d 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -34,31 +34,27 @@ # # +import logging +from collections import deque +from sys import maxint + +import deluge.common as common import deluge.component as component +import deluge.ui.console.colors as colors +import format_utils +from add_util import add_torrent from basemode import BaseMode -import deluge.common -import deluge.common as common from deluge.ui.client import client - -from sys import maxint -from collections import deque - from deluge.ui.sessionproxy import SessionProxy - -from popup import Popup, SelectablePopup, MessagePopup -from add_util import add_torrent from input_popup import InputPopup -import deluge.ui.console.colors as colors -import format_utils - -from torrent_actions import torrent_actions_popup, ACTION +from popup import MessagePopup, Popup, SelectablePopup +from torrent_actions import ACTION, torrent_actions_popup try: import curses except ImportError: pass -import logging log = logging.getLogger(__name__) # Big help string that gets displayed when the user hits 'h' diff --git a/deluge/ui/console/statusbars.py b/deluge/ui/console/statusbars.py index 90585cbc9..778cb8020 100644 --- a/deluge/ui/console/statusbars.py +++ b/deluge/ui/console/statusbars.py @@ -33,10 +33,9 @@ # # -from deluge.core.preferencesmanager import DEFAULT_PREFS - -import deluge.component as component import deluge.common +import deluge.component as component +from deluge.core.preferencesmanager import DEFAULT_PREFS from deluge.ui.client import client diff --git a/deluge/ui/coreconfig.py b/deluge/ui/coreconfig.py index 6120dcfa8..6f90739ec 100644 --- a/deluge/ui/coreconfig.py +++ b/deluge/ui/coreconfig.py @@ -35,6 +35,7 @@ import logging + import deluge.component as component from deluge.ui.client import client diff --git a/deluge/ui/gtkui/aboutdialog.py b/deluge/ui/gtkui/aboutdialog.py index 252a571fd..08937ceb5 100644 --- a/deluge/ui/gtkui/aboutdialog.py +++ b/deluge/ui/gtkui/aboutdialog.py @@ -7,13 +7,14 @@ # See LICENSE for more details. # -import pygtk -pygtk.require('2.0') import gtk -from deluge.ui.client import client +import pygtk -import deluge.common import common +import deluge.common +from deluge.ui.client import client + +pygtk.require('2.0') class AboutDialog: diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py index d9fb09a6d..e1568d1f7 100644 --- a/deluge/ui/gtkui/addtorrentdialog.py +++ b/deluge/ui/gtkui/addtorrentdialog.py @@ -33,29 +33,30 @@ # # - -import pygtk -pygtk.require('2.0') -import gtk -import gobject import base64 import logging import os from urlparse import urljoin +import gobject +import gtk +import pygtk import twisted.web.client import twisted.web.error -from deluge.ui.client import client -from deluge.httpdownloader import download_file -import deluge.component as component -from torrentview_data_funcs import cell_data_size -from deluge.configmanager import ConfigManager + +import common import deluge.common +import deluge.component as component import deluge.ui.common import dialogs -import common - +from deluge.configmanager import ConfigManager +from deluge.httpdownloader import download_file +from deluge.ui.client import client from deluge.ui.gtkui.path_chooser import PathChooser +from torrentview_data_funcs import cell_data_size + +pygtk.require('2.0') + log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/common.py b/deluge/ui/gtkui/common.py index f51747a77..e893d98a1 100644 --- a/deluge/ui/gtkui/common.py +++ b/deluge/ui/gtkui/common.py @@ -8,18 +8,20 @@ # """Common functions for various parts of gtkui to use.""" -import os -import logging import cPickle +import logging +import os import shutil -import pygtk -pygtk.require('2.0') import gtk +import pygtk from gobject import GError import deluge.common +pygtk.require('2.0') + + log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index bf38d8cbe..97548aa72 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -33,23 +33,24 @@ # # -import os -import gtk -import time import hashlib import logging +import os +import time + +import gtk from twisted.internet import reactor +import common import deluge.common import deluge.component as component -import common import deluge.configmanager -from deluge.ui.common import get_localhost_auth -from deluge.ui.client import client import deluge.ui.client +import dialogs from deluge.configmanager import ConfigManager from deluge.error import AuthenticationRequired, BadLoginError, IncompatibleClient -import dialogs +from deluge.ui.client import client +from deluge.ui.common import get_localhost_auth log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py index 8a544529e..6f6bfb945 100644 --- a/deluge/ui/gtkui/createtorrentdialog.py +++ b/deluge/ui/gtkui/createtorrentdialog.py @@ -34,20 +34,20 @@ # -import gtk -import sys -import os.path -import gobject import base64 import logging +import os.path +import sys +import gobject +import gtk from twisted.internet.threads import deferToThread -from deluge.ui.client import client -from deluge.ui.gtkui.torrentview_data_funcs import cell_data_size -import deluge.component as component import deluge.common +import deluge.component as component from deluge.configmanager import ConfigManager +from deluge.ui.client import client +from deluge.ui.gtkui.torrentview_data_funcs import cell_data_size log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/details_tab.py b/deluge/ui/gtkui/details_tab.py index 74009c107..83a6ce486 100644 --- a/deluge/ui/gtkui/details_tab.py +++ b/deluge/ui/gtkui/details_tab.py @@ -10,7 +10,7 @@ import logging import deluge.component as component -from deluge.common import fsize, is_url, fdate +from deluge.common import fdate, fsize, is_url from deluge.ui.gtkui.torrentdetails import Tab log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index f1602ed57..5fee9bd49 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -32,12 +32,11 @@ # statement from all source files in the program, then also delete it here. # import gtk - from twisted.internet import defer -from deluge.ui.gtkui import common -import deluge.component as component import deluge.common +import deluge.component as component +from deluge.ui.gtkui import common class BaseDialog(gtk.Dialog): diff --git a/deluge/ui/gtkui/edittrackersdialog.py b/deluge/ui/gtkui/edittrackersdialog.py index 89de26792..4b1a78f19 100644 --- a/deluge/ui/gtkui/edittrackersdialog.py +++ b/deluge/ui/gtkui/edittrackersdialog.py @@ -33,15 +33,16 @@ # # -import os.path -import gtk import logging +import os.path +import gtk from twisted.internet import defer -import deluge.common + import common -from deluge.ui.client import client +import deluge.common import deluge.component as component +from deluge.ui.client import client log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py index 880b46837..0b10d0a49 100644 --- a/deluge/ui/gtkui/files_tab.py +++ b/deluge/ui/gtkui/files_tab.py @@ -7,18 +7,19 @@ # See LICENSE for more details. # +import cPickle +import logging +import os.path + +import gobject import gtk import gtk.gdk -import gobject -import os.path -import logging -import cPickle -from deluge.ui.gtkui.torrentdetails import Tab -from deluge.ui.client import client -import deluge.component as component import deluge.common -from deluge.ui.gtkui.common import reparent_iter, save_pickled_state_file, load_pickled_state_file +import deluge.component as component +from deluge.ui.client import client +from deluge.ui.gtkui.common import load_pickled_state_file, reparent_iter, save_pickled_state_file +from deluge.ui.gtkui.torrentdetails import Tab log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/filtertreeview.py b/deluge/ui/gtkui/filtertreeview.py index 22b51bbdf..c12546e8b 100644 --- a/deluge/ui/gtkui/filtertreeview.py +++ b/deluge/ui/gtkui/filtertreeview.py @@ -9,17 +9,18 @@ # See LICENSE for more details. # +import logging import os +import warnings + import gtk import pango -import logging -import warnings from gobject import GError import deluge.component as component -from deluge.common import resource_filename, get_pixmap, TORRENT_STATE -from deluge.ui.client import client +from deluge.common import get_pixmap, resource_filename, TORRENT_STATE from deluge.configmanager import ConfigManager +from deluge.ui.client import client log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 66dc6d4ce..876e51e94 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -33,18 +33,45 @@ # # +import logging +import os +import sys +import warnings + import gobject +import gtk +from twisted.internet import gtk2reactor + +import deluge.common +import deluge.component as component +import deluge.error +import dialogs +from addtorrentdialog import AddTorrentDialog +from deluge.configmanager import ConfigManager, get_config_dir +from deluge.ui.client import client +from deluge.ui.gtkui.common import associate_magnet_links +from deluge.ui.sessionproxy import SessionProxy +from deluge.ui.tracker_icons import TrackerIcons +from deluge.ui.ui import _UI +from filtertreeview import FilterTreeView +from ipcinterface import IPCInterface +from mainwindow import MainWindow +from menubar import MenuBar +from pluginmanager import PluginManager +from preferences import Preferences +from queuedtorrents import QueuedTorrents +from sidebar import SideBar +from statusbar import StatusBar +from systemtray import SystemTray +from toolbar import ToolBar +from torrentdetails import TorrentDetails +from torrentview import TorrentView + gobject.set_prgname("deluge") # Install the twisted reactor -from twisted.internet import gtk2reactor reactor = gtk2reactor.install() -import os -import gtk -import sys -import logging -import warnings log = logging.getLogger(__name__) @@ -54,31 +81,6 @@ except ImportError: setproctitle = lambda t: None getproctitle = lambda: None -import deluge.component as component -from deluge.ui.client import client -from mainwindow import MainWindow -from menubar import MenuBar -from toolbar import ToolBar -from torrentview import TorrentView -from torrentdetails import TorrentDetails -from sidebar import SideBar -from filtertreeview import FilterTreeView -from preferences import Preferences -from systemtray import SystemTray -from statusbar import StatusBar -from pluginmanager import PluginManager -from ipcinterface import IPCInterface -from deluge.ui.tracker_icons import TrackerIcons -from queuedtorrents import QueuedTorrents -from addtorrentdialog import AddTorrentDialog -from deluge.ui.sessionproxy import SessionProxy -import dialogs -from deluge.ui.gtkui.common import associate_magnet_links -from deluge.configmanager import ConfigManager, get_config_dir -import deluge.common -import deluge.error -from deluge.ui.ui import _UI - class Gtk(_UI): diff --git a/deluge/ui/gtkui/ipcinterface.py b/deluge/ui/gtkui/ipcinterface.py index 6d7605b0d..e93b6d60d 100644 --- a/deluge/ui/gtkui/ipcinterface.py +++ b/deluge/ui/gtkui/ipcinterface.py @@ -33,29 +33,28 @@ # # - -import sys -import os import base64 import logging -from urllib import url2pathname -from urlparse import urlparse +import os +import sys from glob import glob from tempfile import mkstemp +from urllib import url2pathname +from urlparse import urlparse -try: - import rencode -except ImportError: - import deluge.rencode as rencode +import twisted.internet.error +from twisted.internet import reactor +from twisted.internet.protocol import ClientFactory, Factory, Protocol -import deluge.component as component -from deluge.ui.client import client import deluge.common +import deluge.component as component from deluge.configmanager import ConfigManager +from deluge.ui.client import client -from twisted.internet.protocol import Factory, Protocol, ClientFactory -from twisted.internet import reactor -import twisted.internet.error +try: + import rencode +except ImportError: + import deluge.rencode as rencode log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index ee432a761..84b1452e5 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -35,12 +35,15 @@ # import logging -import pygtk -pygtk.require('2.0') + import gtk +import pygtk from gobject import signal_new, SIGNAL_RUN_LAST, TYPE_NONE -from deluge.ui.gtkui.common import save_pickled_state_file, load_pickled_state_file +from deluge.ui.gtkui.common import load_pickled_state_file, save_pickled_state_file + +pygtk.require('2.0') + signal_new('button-press-event', gtk.TreeViewColumn, SIGNAL_RUN_LAST, TYPE_NONE, (gtk.gdk.Event,)) diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index 27878fd2b..201d33efe 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/deluge/ui/gtkui/mainwindow.py @@ -8,28 +8,31 @@ # import copy -import os.path -import pygtk -pygtk.require('2.0') -import gtk import logging +import os.path from hashlib import sha1 as sha +import gtk +import pygtk from twisted.internet import reactor from twisted.internet.error import ReactorNotRunning +import deluge.common +import deluge.component as component +import deluge.ui.gtkui.common +from deluge.configmanager import ConfigManager +from deluge.ui.client import client +from deluge.ui.gtkui.dialogs import PasswordDialog +from deluge.ui.gtkui.ipcinterface import process_args + +pygtk.require('2.0') + + try: import wnck except ImportError: wnck = None -import deluge.common -import deluge.ui.gtkui.common -import deluge.component as component -from deluge.ui.client import client -from deluge.configmanager import ConfigManager -from deluge.ui.gtkui.ipcinterface import process_args -from deluge.ui.gtkui.dialogs import PasswordDialog log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index 2e93be709..0c40ee6c1 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -9,20 +9,23 @@ # +import logging import os.path -import pygtk -pygtk.require('2.0') + import gtk -import logging +import pygtk -import deluge.error -import deluge.component as component -from deluge.ui.client import client import deluge.common +import deluge.component as component +import deluge.error import dialogs from deluge.configmanager import ConfigManager +from deluge.ui.client import client from deluge.ui.gtkui.path_chooser import PathChooser +pygtk.require('2.0') + + log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/new_release_dialog.py b/deluge/ui/gtkui/new_release_dialog.py index 767b2f50b..9218dcb43 100644 --- a/deluge/ui/gtkui/new_release_dialog.py +++ b/deluge/ui/gtkui/new_release_dialog.py @@ -34,11 +34,12 @@ # -import deluge.component as component import deluge.common +import deluge.component as component from deluge.configmanager import ConfigManager from deluge.ui.client import client + class NewReleaseDialog: def __init__(self): pass @@ -82,4 +83,3 @@ class NewReleaseDialog: def _on_button_close_new_release(self, widget): self.config["show_new_releases"] = not self.chk_not_show_dialog.get_active() self.dialog.destroy() - diff --git a/deluge/ui/gtkui/notification.py b/deluge/ui/gtkui/notification.py index b7ab70d10..643691535 100644 --- a/deluge/ui/gtkui/notification.py +++ b/deluge/ui/gtkui/notification.py @@ -35,9 +35,10 @@ import logging -import deluge.component as component -import deluge.common + import common +import deluge.common +import deluge.component as component from deluge.configmanager import ConfigManager from deluge.ui.client import client diff --git a/deluge/ui/gtkui/path_chooser.py b/deluge/ui/gtkui/path_chooser.py index 6c4902e0c..67dad9ed6 100644 --- a/deluge/ui/gtkui/path_chooser.py +++ b/deluge/ui/gtkui/path_chooser.py @@ -34,9 +34,9 @@ import logging +import deluge.component as component from deluge.ui.client import client from deluge.ui.gtkui.path_combo_chooser import PathChooserComboBox -import deluge.component as component log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/path_combo_chooser.py b/deluge/ui/gtkui/path_combo_chooser.py index 18ec2b5ea..7d008af64 100755 --- a/deluge/ui/gtkui/path_combo_chooser.py +++ b/deluge/ui/gtkui/path_combo_chooser.py @@ -1,4 +1,3 @@ -from __future__ import print_function #!/usr/bin/env python # -*- coding: utf-8 -*- # @@ -35,13 +34,15 @@ from __future__ import print_function # statement from all source files in the program, then also delete it here. # +from __future__ import print_function + import os import gobject import gtk from gtk import gdk, keysyms -from deluge.path_chooser_common import get_resource, get_completion_paths +from deluge.path_chooser_common import get_completion_paths, get_resource def is_ascii_value(keyval, ascii_key): diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py index 1a2803115..8b724519d 100644 --- a/deluge/ui/gtkui/peers_tab.py +++ b/deluge/ui/gtkui/peers_tab.py @@ -33,18 +33,19 @@ # # -import gtk import logging import os.path from itertools import izip -from deluge.ui.client import client -import deluge.component as component +import gtk + import deluge.common -from deluge.ui.gtkui.torrentview_data_funcs import cell_data_speed_down, cell_data_speed_up -from deluge.ui.gtkui.torrentdetails import Tab +import deluge.component as component +from deluge.ui.client import client from deluge.ui.countries import COUNTRIES -from deluge.ui.gtkui.common import save_pickled_state_file, load_pickled_state_file +from deluge.ui.gtkui.common import load_pickled_state_file, save_pickled_state_file +from deluge.ui.gtkui.torrentdetails import Tab +from deluge.ui.gtkui.torrentview_data_funcs import cell_data_speed_down, cell_data_speed_up log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/piecesbar.py b/deluge/ui/gtkui/piecesbar.py index ce5a186b1..0487f9e8d 100644 --- a/deluge/ui/gtkui/piecesbar.py +++ b/deluge/ui/gtkui/piecesbar.py @@ -34,12 +34,14 @@ # # -import gtk +import logging +from math import pi + import cairo +import gtk import pango import pangocairo -import logging -from math import pi + from deluge.configmanager import ConfigManager log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/pluginmanager.py b/deluge/ui/gtkui/pluginmanager.py index a5bfcc819..b7356e307 100644 --- a/deluge/ui/gtkui/pluginmanager.py +++ b/deluge/ui/gtkui/pluginmanager.py @@ -35,10 +35,11 @@ import logging + import deluge.component as component import deluge.pluginmanagerbase -from deluge.ui.client import client from deluge.configmanager import ConfigManager +from deluge.ui.client import client log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 6ace51acd..b468c9828 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -34,22 +34,25 @@ # # -import os -import pygtk -pygtk.require('2.0') -import gtk import logging +import os from hashlib import sha1 as sha -import deluge.component as component -from deluge.ui.client import client -from deluge.ui.gtkui.path_chooser import PathChooser -import deluge.common +import gtk +import pygtk + import common +import deluge.common +import deluge.component as component +import deluge.configmanager import dialogs from deluge.configmanager import ConfigManager -import deluge.configmanager from deluge.error import AuthManagerError, NotAuthorizedError +from deluge.ui.client import client +from deluge.ui.gtkui.path_chooser import PathChooser + +pygtk.require('2.0') + log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/queuedtorrents.py b/deluge/ui/gtkui/queuedtorrents.py index 8d26cce2c..e2a547414 100644 --- a/deluge/ui/gtkui/queuedtorrents.py +++ b/deluge/ui/gtkui/queuedtorrents.py @@ -33,17 +33,17 @@ # # +import logging import os.path -import gtk -import logging import gobject +import gtk -import deluge.component as component -from deluge.ui.gtkui.ipcinterface import process_args +import common import deluge.common +import deluge.component as component from deluge.configmanager import ConfigManager -import common +from deluge.ui.gtkui.ipcinterface import process_args log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/removetorrentdialog.py b/deluge/ui/gtkui/removetorrentdialog.py index 6742220db..12601efd4 100644 --- a/deluge/ui/gtkui/removetorrentdialog.py +++ b/deluge/ui/gtkui/removetorrentdialog.py @@ -33,16 +33,18 @@ # # +import logging import os + import gtk -import logging -from deluge.ui.client import client import deluge.common import deluge.component as component +from deluge.ui.client import client log = logging.getLogger(__name__) + class RemoveTorrentDialog(object): """ This class is used to create and show a Remove Torrent Dialog. diff --git a/deluge/ui/gtkui/sidebar.py b/deluge/ui/gtkui/sidebar.py index d31fefa44..37dea5c41 100644 --- a/deluge/ui/gtkui/sidebar.py +++ b/deluge/ui/gtkui/sidebar.py @@ -35,11 +35,12 @@ # -import gtk import logging -import deluge.component as component +import gtk + import deluge.common +import deluge.component as component from deluge.configmanager import ConfigManager log = logging.getLogger(__name__) @@ -110,5 +111,3 @@ class SideBar(component.Component): self.notebook.set_show_tabs(False) else: self.notebook.set_show_tabs(True) - - diff --git a/deluge/ui/gtkui/status_tab.py b/deluge/ui/gtkui/status_tab.py index bc69393ae..2ad6b0467 100644 --- a/deluge/ui/gtkui/status_tab.py +++ b/deluge/ui/gtkui/status_tab.py @@ -37,10 +37,10 @@ import logging import deluge.component as component -from deluge.common import fsize, fspeed, fdate, fpeer, ftime +from deluge.common import fdate, fpeer, fsize, fspeed, ftime from deluge.configmanager import ConfigManager -from deluge.ui.gtkui.torrentdetails import Tab from deluge.ui.gtkui.piecesbar import PiecesBar +from deluge.ui.gtkui.torrentdetails import Tab log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/statusbar.py b/deluge/ui/gtkui/statusbar.py index 59a1020f8..e3d23f811 100644 --- a/deluge/ui/gtkui/statusbar.py +++ b/deluge/ui/gtkui/statusbar.py @@ -34,16 +34,16 @@ # -import gtk -import gobject import logging -from deluge.ui.client import client -import deluge.component as component +import gobject +import gtk + import deluge.common -from deluge.ui.gtkui import common -from deluge.ui.gtkui import dialogs +import deluge.component as component from deluge.configmanager import ConfigManager +from deluge.ui.client import client +from deluge.ui.gtkui import common, dialogs log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py index cad5507a5..b15b51779 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/deluge/ui/gtkui/systemtray.py @@ -38,16 +38,17 @@ try: except ImportError: appindicator = None +import logging import os + import gtk -import logging -import deluge.component as component -from deluge.ui.client import client +import common import deluge.common +import deluge.component as component from deluge.configmanager import ConfigManager +from deluge.ui.client import client from deluge.ui.gtkui import dialogs -import common log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/toolbar.py b/deluge/ui/gtkui/toolbar.py index a9ddef872..f0ab7e27f 100644 --- a/deluge/ui/gtkui/toolbar.py +++ b/deluge/ui/gtkui/toolbar.py @@ -7,14 +7,17 @@ # See LICENSE for more details. # -import pygtk -pygtk.require('2.0') -import gtk import logging +import gtk +import pygtk + import deluge.component as component from deluge.configmanager import ConfigManager +pygtk.require('2.0') + + log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/torrentdetails.py b/deluge/ui/gtkui/torrentdetails.py index 44e9e3ed0..3f7aa050a 100644 --- a/deluge/ui/gtkui/torrentdetails.py +++ b/deluge/ui/gtkui/torrentdetails.py @@ -10,12 +10,13 @@ """The torrent details component shows info about the selected torrent.""" -import gtk import logging +import gtk + import deluge.component as component from deluge.ui.client import client -from deluge.ui.gtkui.common import save_pickled_state_file, load_pickled_state_file +from deluge.ui.gtkui.common import load_pickled_state_file, save_pickled_state_file log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 8e9707bad..117df6c58 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -7,22 +7,22 @@ # See LICENSE for more details. # - """The torrent view component that lists all torrents in the session.""" -import pygtk -pygtk.require('2.0') -import gtk -import gobject import logging +import gobject +import gtk +import pygtk from twisted.internet import reactor -import listview import deluge.component as component +import listview +import torrentview_data_funcs as funcs from deluge.ui.client import client from removetorrentdialog import RemoveTorrentDialog -import torrentview_data_funcs as funcs + +pygtk.require('2.0') log = logging.getLogger(__name__) diff --git a/deluge/ui/gtkui/torrentview_data_funcs.py b/deluge/ui/gtkui/torrentview_data_funcs.py index 06540a253..217812e0a 100644 --- a/deluge/ui/gtkui/torrentview_data_funcs.py +++ b/deluge/ui/gtkui/torrentview_data_funcs.py @@ -1,4 +1,3 @@ -from __future__ import print_function # -*- coding: utf-8 -*- # torrentview_data_funcs.py # @@ -34,10 +33,14 @@ from __future__ import print_function # # -import deluge.common as common -import gtk +from __future__ import print_function + import warnings + import gobject +import gtk + +import deluge.common as common import deluge.component as component # Status icons.. Create them from file only once to avoid constantly diff --git a/deluge/ui/sessionproxy.py b/deluge/ui/sessionproxy.py index 2ba8f1cea..926193e77 100644 --- a/deluge/ui/sessionproxy.py +++ b/deluge/ui/sessionproxy.py @@ -34,11 +34,12 @@ # import logging +import time + from twisted.internet.defer import maybeDeferred, succeed import deluge.component as component from deluge.ui.client import client -import time log = logging.getLogger(__name__) diff --git a/deluge/ui/tracker_icons.py b/deluge/ui/tracker_icons.py index 0143aab02..204954483 100644 --- a/deluge/ui/tracker_icons.py +++ b/deluge/ui/tracker_icons.py @@ -33,24 +33,26 @@ # # -import os import logging -from HTMLParser import HTMLParser, HTMLParseError -from urlparse import urljoin, urlparse +import os +from HTMLParser import HTMLParseError, HTMLParser from tempfile import mkstemp +from urlparse import urljoin, urlparse from twisted.internet import defer, threads from twisted.web.error import PageRedirect + +from deluge.component import Component +from deluge.configmanager import get_config_dir +from deluge.decorators import proxy +from deluge.httpdownloader import download_file + try: from twisted.web.resource import NoResource, ForbiddenResource except ImportError: # twisted 8 from twisted.web.error import NoResource, ForbiddenResource -from deluge.component import Component -from deluge.configmanager import get_config_dir -from deluge.httpdownloader import download_file -from deluge.decorators import proxy try: diff --git a/deluge/ui/ui.py b/deluge/ui/ui.py index 492aea0e2..83cb01b3e 100644 --- a/deluge/ui/ui.py +++ b/deluge/ui/ui.py @@ -1,4 +1,3 @@ -from __future__ import print_function # # ui.py # @@ -34,10 +33,12 @@ from __future__ import print_function # # +from __future__ import print_function + +import logging import os import sys -import logging -from optparse import OptionParser, OptionGroup +from optparse import OptionGroup, OptionParser import deluge.common import deluge.configmanager 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): |