Module: deluge Branch: master Commit: 9ac0d62149286e5a5d336e081a64791739bfd62a
Author: Andrew Resch <[email protected]> Date: Wed Feb 23 11:21:47 2011 -0800 Remove some imports that are no longer neccessary --- deluge/common.py | 1 - deluge/core/core.py | 8 -------- deluge/core/pluginmanager.py | 2 -- deluge/core/rpcserver.py | 2 +- deluge/core/torrentmanager.py | 3 +-- deluge/maketorrent.py | 2 +- deluge/rencode.py | 1 - deluge/ui/gtkui/connectionmanager.py | 1 - deluge/ui/gtkui/mainwindow.py | 1 - deluge/ui/gtkui/peers_tab.py | 1 - deluge/ui/gtkui/torrentview.py | 2 +- 11 files changed, 4 insertions(+), 20 deletions(-) diff --git a/deluge/common.py b/deluge/common.py index c3270b1..7246cd3 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -40,7 +40,6 @@ import os import time import subprocess import platform -import sys import chardet import logging diff --git a/deluge/core/core.py b/deluge/core/core.py index 6d4c137..983bfa7 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -38,18 +38,10 @@ from deluge._libtorrent import lt import os import glob import base64 -import shutil import logging import threading -import pkg_resources -import warnings import tempfile - -from twisted.internet import reactor, defer -from twisted.internet.task import LoopingCall -import twisted.web.client - from deluge.httpdownloader import download_file import deluge.configmanager diff --git a/deluge/core/pluginmanager.py b/deluge/core/pluginmanager.py index 1199289..5ef5ef5 100644 --- a/deluge/core/pluginmanager.py +++ b/deluge/core/pluginmanager.py @@ -37,8 +37,6 @@ """PluginManager for Core""" import logging -from twisted.internet import reactor -from twisted.internet.task import LoopingCall from deluge.event import PluginEnabledEvent, PluginDisabledEvent import deluge.pluginmanagerbase diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index ef2e334..e309f7b 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -43,7 +43,7 @@ import logging import traceback from twisted.internet.protocol import Factory, Protocol -from twisted.internet import ssl, reactor, defer +from twisted.internet import reactor, defer from OpenSSL import crypto, SSL from types import FunctionType diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 4c57874..269fe02 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -44,7 +44,6 @@ import operator import logging import re -from twisted.internet import reactor from twisted.internet.task import LoopingCall from deluge._libtorrent import lt @@ -569,7 +568,7 @@ class TorrentManager(component.Component): # Remove the torrent from deluge's session try: del self.torrents[torrent_id] - except KeyError, ValueError: + except (KeyError, ValueError): return False # Save the session state diff --git a/deluge/maketorrent.py b/deluge/maketorrent.py index 585dcaa..196399d 100644 --- a/deluge/maketorrent.py +++ b/deluge/maketorrent.py @@ -38,7 +38,7 @@ import os from hashlib import sha1 as sha from deluge.common import get_path_size -from deluge.bencode import bencode, bdecode +from deluge.bencode import bencode class InvalidPath(Exception): """ diff --git a/deluge/rencode.py b/deluge/rencode.py index 2b32c00..1172df2 100644 --- a/deluge/rencode.py +++ b/deluge/rencode.py @@ -63,7 +63,6 @@ __all__ = ['dumps', 'loads'] # import struct -import string from threading import Lock # Default number of bits for serialized floats, either 32 or 64 (also a parameter for dumps()). diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 9ce16ac..2ea302e 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -35,7 +35,6 @@ import gtk import pkg_resources -import urlparse import time import hashlib import logging diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index 12fa5a9..a3265d8 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/deluge/ui/gtkui/mainwindow.py @@ -38,7 +38,6 @@ import pygtk pygtk.require('2.0') import gtk import gtk.glade -import gobject import logging import pkg_resources from urlparse import urlparse diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py index 20cdfbf..b4a39ce 100644 --- a/deluge/ui/gtkui/peers_tab.py +++ b/deluge/ui/gtkui/peers_tab.py @@ -40,7 +40,6 @@ import logging import os.path import cPickle import pkg_resources -import gobject from itertools import izip from deluge.ui.client import client diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 659010f..46d9dbc 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -477,7 +477,7 @@ class TorrentView(listview.ListView, component.Component): return [] return torrent_ids - except ValueError, TypeError: + except (ValueError, TypeError): return [] def get_torrent_status(self, torrent_id): -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
