diff options
author | ardi69 <armin@diedering.de> | 2015-04-21 06:51:24 +0200 |
---|---|---|
committer | ardi69 <armin@diedering.de> | 2015-04-21 06:51:24 +0200 |
commit | 2f8433b6a10505d29a1b63ea8bbd9b0bf3f7d9f6 (patch) | |
tree | b82a8b5fc0a309f69733b0a004284f4ef45833d8 /pyload/network/RequestFactory.py | |
parent | added check of classname == filename (diff) | |
parent | Merge branch 'pr/n10_ardi69' into 0.4.10 (diff) | |
download | pyload-2f8433b6a10505d29a1b63ea8bbd9b0bf3f7d9f6.tar.xz |
Merge pull request #4 from vuolter/0.4.10
vuolter HEAD
Diffstat (limited to 'pyload/network/RequestFactory.py')
-rw-r--r-- | pyload/network/RequestFactory.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pyload/network/RequestFactory.py b/pyload/network/RequestFactory.py index 0591c5162..5e2c15f4b 100644 --- a/pyload/network/RequestFactory.py +++ b/pyload/network/RequestFactory.py @@ -7,7 +7,6 @@ from pyload.network.Browser import Browser from pyload.network.Bucket import Bucket from pyload.network.HTTPRequest import HTTPRequest from pyload.network.CookieJar import CookieJar - from pyload.network.XDCCRequest import XDCCRequest @@ -88,8 +87,10 @@ class RequestFactory(object): else: type = "http" setting = self.core.config.get("proxy", "type").lower() - if setting == "socks4": type = "socks4" - elif setting == "socks5": type = "socks5" + if setting == "socks4": + type = "socks4" + elif setting == "socks5": + type = "socks5" username = None if self.core.config.get("proxy", "username") and self.core.config.get("proxy", "username").lower() != "none": @@ -105,7 +106,7 @@ class RequestFactory(object): "port": self.core.config.get("proxy", "port"), "username": username, "password": pw, - } + } def getOptions(self): |