cookie jar => cookies

diff --git a/requests/api.py b/requests/api.py
index fcd02b56af9b219f0686ad0a1cc2582bfe50c3e4..0f380a60b66939b6e3d5a3e7520ac47376b55251 100644 (file)
--- a/requests/api.py
+++ b/requests/api.py
@@ -61,7 +61,7 @@ def request(method, url,
         data=data,
         params=params,
         headers=headers,
-        cookiejar=cookies,
+        cookies=cookies,
         files=files,
         auth=auth,
         timeout=timeout or config.settings.timeout,

diff --git a/requests/models.py b/requests/models.py
index 4ff80ca1b54d97caf74d543030dd7fbbb8202ef5..d7d3237486ebd50b12c2cf154231119503ae5f3d 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -35,7 +35,7 @@ class Request(object):
 
     def __init__(self,
         url=None, headers=dict(), files=None, method=None, data=dict(),
-        params=dict(), auth=None, cookiejar=None, timeout=None, redirect=False,
+        params=dict(), auth=None, cookies=None, timeout=None, redirect=False,
         allow_redirects=False, proxies=None):
 
         #: Float describ the timeout of the request.
@@ -90,7 +90,7 @@ class Request(object):
         self.auth = auth
 
         #: CookieJar to attach to :class:`Request <Request>`.
-        self.cookiejar = cookiejar
+        self.cookies = cookies
 
         #: True if Request has been sent.
         self.sent = False
@@ -298,10 +298,8 @@ class Request(object):
             pass
 
         # Setup cookies.
-        # elif self.cookies:
-            # pass
-
-        # req = _Request(url, data=self._enc_data, method=self.method)
+        elif self.cookies:
+            pass
 
         # Only send the Request if new or forced.
         if (anyway) or (not self.sent):