PEP-8, Python Zen, refactor and reduce code (part 9 in master module/network)

Conflicts:
	module/network/Bucket.py
	module/network/CookieJar.py
	pyload/network/Browser.py
	pyload/network/HTTPChunk.py
	pyload/network/HTTPDownload.py
	pyload/network/HTTPRequest.py
	pyload/network/RequestFactory.py
	pyload/network/XDCCRequest.py

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):