From df66fa7975dd359c97161848a175122a5406ee06 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 25 Sep 2011 16:02:22 -0400
Subject: [PATCH] merge bugs

---
 requests/api.py    | 22 ----------------------
 requests/models.py |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/requests/api.py b/requests/api.py
index 12381ce3..fcd02b56 100644
--- 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 a7a8c815..a90924db 100644
--- 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