mirrors/deluge
1
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-20 11:35:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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 cb661f2595
commit 18eb885983
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
deluge/ui/tracker_icons.py
View file

@ -39,7 +39,12 @@ from urlparse import urljoin, urlparse
from tempfile import mkstemp
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.configmanager import get_config_dir
@ -235,7 +240,7 @@ class TrackerIcons(Component):
error_msg = f.getErrorMessage()
log.debug("Error downloading page: %s", error_msg)
d = f
if f.check(error.PageRedirect):
if f.check(PageRedirect):
# Handle redirect errors
location = urljoin(self.host_to_url(host), error_msg.split(" to ")[1])
self.redirects[host] = url_to_host(location)
@ -375,14 +380,14 @@ class TrackerIcons(Component):
error_msg = f.getErrorMessage()
log.debug("Error downloading icon: %s", error_msg)
d = f
if f.check(error.PageRedirect):
if f.check(PageRedirect):
# Handle redirect errors
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)
if not icons:
d.addCallbacks(self.on_download_icon_complete, self.on_download_icon_fail,
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)
elif f.check(NoIconsError, HTMLParseError):
# No icons, try favicon.ico as an act of desperation