Merge branch 'master' into HEAD

deluge/httpdownloader.py

@@ -196,7 +196,17 @@ def download_file(url, filename, callback=None, headers=None,
             headers = {}
         headers["accept-encoding"] = "deflate, gzip, x-gzip"
 
+    # In twisted 13.1.0 the _parse() function was replaced by the _URI class 
+    if hasattr(client, '_parse'):
         scheme, host, port, path = client._parse(url)
+    else:
+        from twisted.web.client import _URI
+        uri = _URI.fromBytes(url)
+        scheme = uri.scheme
+        host = uri.host
+        port = uri.port
+        path = uri.path
+
     factory = HTTPDownloader(url, filename, callback, headers, force_filename, allow_compression)
     if scheme == "https":
         from twisted.internet import ssl