merge bugs

diff --git a/requests/api.py b/requests/api.py
index 12381ce39d31d86ae7210439f22a53bde8fcd2fd..fcd02b56af9b219f0686ad0a1cc2582bfe50c3e4 100644 (file)
--- a/requests/api.py
+++ b/requests/api.py
@@ -56,28 +56,6 @@ def request(method, url,
             headers[k] = header_expand(v)
 
     args = dict(
-        method = method,
-        url = url,
-        data = data,
-        params = params,
-        headers = headers,
-        cookiejar = cookies,
-        files = files,
-        auth = auth,
-        timeout = timeout or config.settings.timeout,
-        allow_redirects = allow_redirects,
-        proxies = proxies or config.settings.proxies,
-        method = method,
-        url = url,
-        data = data,
-        params = params,
-        headers = headers,
-        cookiejar = cookies,
-        files = files,
-        auth = auth,
-        timeout = timeout or config.settings.timeout,
-        allow_redirects = allow_redirects,
-        proxies = proxies or config.settings.proxies
         method=method,
         url=url,
         data=data,

diff --git a/requests/models.py b/requests/models.py
index a7a8c815163ed1cb8ee1bd7a1172a0d5552181da..a90924db50c6ef64a27a6b5674544b225b96a938 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -184,12 +184,12 @@ class Request(object):
 
                 # if self.cookiejar:
 
-                    response.cookies = dict_from_cookiejar(self.cookiejar)
+                    # response.cookies = dict_from_cookiejar(self.cookiejar)
 
 
                     # response.cookies = dict_from_cookiejar(self.cookiejar)
 
-                    response.cookies = dict_from_cookiejar(self.cookiejar)
+                    # response.cookies = dict_from_cookiejar(self.cookiejar)
 
             except AttributeError:
                 pass