From d25e9ac4e9f698ecfaa02e1a915a66af8da861a1 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 18 Sep 2012 10:58:55 +0200
Subject: Backed out changeset e7db858d5ab2

---
 module/network/RequestFactory.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'module/network/RequestFactory.py')

diff --git a/module/network/RequestFactory.py b/module/network/RequestFactory.py
index aa8977c4d..5b1528281 100644
--- a/module/network/RequestFactory.py
+++ b/module/network/RequestFactory.py
@@ -40,17 +40,16 @@ class RequestFactory():
     def getRequest(self, pluginName, account=None, type="HTTP"):
         self.lock.acquire()
 
-        req = None
         if type == "XDCC":
-            req = XDCCRequest(proxies=self.getProxies())
+            return XDCCRequest(proxies=self.getProxies())
+
+        req = Browser(self.bucket, self.getOptions())
+
+        if account:
+            cj = self.getCookieJar(pluginName, account)
+            req.setCookieJar(cj)
         else:
-            req = Browser(self.bucket, self.getOptions())
-    
-            if account:
-                cj = self.getCookieJar(pluginName, account)
-                req.setCookieJar(cj)
-            else:
-                req.setCookieJar(CookieJar(pluginName))
+            req.setCookieJar(CookieJar(pluginName))
 
         self.lock.release()
         return req
-- 
cgit v1.2.3