merge cleanups

diff --git a/requests/api.py b/requests/api.py
index 6b1839a713132ece81579f502a0d75da0e3bab8e..696305e536a59e2ee16d3ca30a87766d41149f67 100644 (file)
--- a/requests/api.py
+++ b/requests/api.py
@@ -46,10 +46,7 @@ def request(method, url,
     method = str(method).upper()
     config = get_config(config)
 
-    cookies = cookiejar_from_dict(cookies if cookies is not None else dict())
-
-    cookies = cookiejar_from_dict(cookies)
-
+    # cookies = cookiejar_from_dict(cookies if cookies is not None else dict())
     # cookies = cookiejar_from_dict(cookies)
 
     # Expand header values
@@ -72,7 +69,7 @@ def request(method, url,
         proxies=proxies or config.get('proxies'),
         _pools=_pools
     )
-    
+
     hooks = setup_hooks(hooks if hooks is not None else dict())
 
     # Arguments manipulation hook.

diff --git a/requests/models.py b/requests/models.py
index 2c863b880ad704fa978a772f5bc1498fe9c08d65..e27e1bd3155862cc3e75d80cc38045ab3210c293 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -90,7 +90,7 @@ class Request(object):
         #: :class:`AuthObject` to attach to :class:`Request <Request>`.
         self.auth = auth
 
-        #: CookieJar to attach to :class:`Request <Request>`.
+        #: CookieDict to attach to :class:`Request <Request>`.
         self.cookies = cookies
 
         #: True if Request has been sent.
@@ -316,6 +316,7 @@ class Request(object):
                     if 'cookie' not in self.headers:
 
                         # Simple cookie with our dict.
+                        # TODO: Multi-value headers.
                         c = SimpleCookie()
                         c.load(self.cookies)