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

Fix for Twisted 15.0 URI class rename

This commit is contained in:
Andrew Resch 2015-02-23 00:31:00 -08:00 committed by Calum Lind
parent faf3f96322
commit 2c7bbc6ade
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/httpdownloader.py
View File

@ -175,12 +175,17 @@ def download_file(url, filename, callback=None, headers=None, force_filename=Fal
headers = {} headers = {}
headers["accept-encoding"] = "deflate, gzip, x-gzip" headers["accept-encoding"] = "deflate, gzip, x-gzip"
# In twisted 13.1.0 the _parse() function was replaced by the _URI class # In Twisted 13.1.0 _parse() function replaced by _URI class.
if hasattr(client, '_parse'): # In Twisted 15.0.0 _URI class renamed to URI.
if hasattr(client, "_parse"):
scheme, host, port, path = client._parse(url) scheme, host, port, path = client._parse(url)
else: else:
from twisted.web.client import _URI try:
uri = _URI.fromBytes(url) from twisted.web.client import _URI as URI
except ImportError:
from twisted.web.client import URI
uri = URI.fromBytes(url)
scheme = uri.scheme scheme = uri.scheme
host = uri.host host = uri.host
port = uri.port port = uri.port