codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use deprecated twisted imports (fixes #2164) 

Aliases have been removed in twisted 12.2.0.
This commit is contained in:
John Garland 2012-09-16 17:12:16 +10:00
parent c8384bf304
commit 129c09c5a7
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deluge/tests/test_httpdownloader.py
View File

@ -5,7 +5,11 @@ from twisted.trial import unittest
from twisted.internet import reactor from twisted.internet import reactor
from twisted.python.failure import Failure from twisted.python.failure import Failure
from twisted.web.http import FORBIDDEN, NOT_MODIFIED from twisted.web.http import FORBIDDEN, NOT_MODIFIED
from twisted.web.resource import Resource, ForbiddenResource try:
from twisted.web.resource import Resource, ForbiddenResource
except ImportError:
# twisted 8
from twisted.web.error import Resource, ForbiddenResource
from twisted.web.server import Site from twisted.web.server import Site
from deluge.httpdownloader import download_file from deluge.httpdownloader import download_file

13
deluge/ui/tracker_icons.py
View File

@ -40,7 +40,12 @@ from urlparse import urljoin, urlparse
from tempfile import mkstemp from tempfile import mkstemp
from twisted.internet import defer, threads from twisted.internet import defer, threads
from twisted.web import error from twisted.web.error import PageRedirect
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.component import Component
from deluge.configmanager import get_config_dir from deluge.configmanager import get_config_dir
@ -238,7 +243,7 @@ class TrackerIcons(Component):
error_msg = f.getErrorMessage() error_msg = f.getErrorMessage()
log.debug("Error downloading page: %s", error_msg) log.debug("Error downloading page: %s", error_msg)
d = f d = f
if f.check(error.PageRedirect): if f.check(PageRedirect):
# Handle redirect errors # Handle redirect errors
location = urljoin(self.host_to_url(host), error_msg.split(" to ")[1]) location = urljoin(self.host_to_url(host), error_msg.split(" to ")[1])
self.redirects[host] = url_to_host(location) self.redirects[host] = url_to_host(location)
@ -378,14 +383,14 @@ class TrackerIcons(Component):
error_msg = f.getErrorMessage() error_msg = f.getErrorMessage()
log.debug("Error downloading icon: %s", error_msg) log.debug("Error downloading icon: %s", error_msg)
d = f d = f
if f.check(error.PageRedirect): if f.check(PageRedirect):
# Handle redirect errors # Handle redirect errors
location = urljoin(self.host_to_url(host), error_msg.split(" to ")[1]) location = urljoin(self.host_to_url(host), error_msg.split(" to ")[1])
d = self.download_icon([(location, extension_to_mimetype(location.rpartition('.')[2]))] + icons, host) d = self.download_icon([(location, extension_to_mimetype(location.rpartition('.')[2]))] + icons, host)
if not icons: if not icons:
d.addCallbacks(self.on_download_icon_complete, self.on_download_icon_fail, d.addCallbacks(self.on_download_icon_complete, self.on_download_icon_fail,
callbackArgs=(host,), errbackArgs=(host,)) callbackArgs=(host,), errbackArgs=(host,))
elif f.check(error.NoResource, error.ForbiddenResource) and icons: elif f.check(NoResource, ForbiddenResource) and icons:
d = self.download_icon(icons, host) d = self.download_icon(icons, host)
elif f.check(NoIconsError, HTMLParseError): elif f.check(NoIconsError, HTMLParseError):
# No icons, try favicon.ico as an act of desperation # No icons, try favicon.ico as an act of desperation