From: Chris Adams <chris@improbable.org>
Date: Sun, 29 Jan 2012 21:52:08 +0000 (-0500)
Subject: Consistent self.cookies usage
X-Git-Tag: v0.10.2~35^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3020d0e56a552cd0a1f603aba69393511ac22d81;p=services%2Fpython-requests.git

Consistent self.cookies usage

This avoids two variables pointing to the same thing and avoids
a duplicate dict update() call
---

diff --git a/requests/models.py b/requests/models.py
index 3f8547e..b4118b9 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -203,7 +203,7 @@ class Request(object):
         history = []
 
         r = build(resp)
-        cookies = self.cookies
+
         self.cookies.update(r.cookies)
 
         if r.status_code in REDIRECT_STATI and not self.redirect:
@@ -247,7 +247,7 @@ class Request(object):
                     method=method,
                     params=self.session.params,
                     auth=self.auth,
-                    cookies=cookies,
+                    cookies=self.cookies,
                     redirect=True,
                     config=self.config,
                     timeout=self.timeout,
@@ -258,7 +258,6 @@ class Request(object):
                 )
 
                 request.send()
-                cookies.update(request.response.cookies)
                 r = request.response
                 self.cookies.update(r.cookies)