From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Thu, 3 May 2012 08:28:59 +0000 (-0700)
Subject: fix crash in safe mode when response.cookies is None
X-Git-Tag: v0.12.1~11^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bf53676b87fa4951e23f67d2251f5dfae4e5206;p=services%2Fpython-requests.git

fix crash in safe mode when response.cookies is None
---

diff --git a/requests/sessions.py b/requests/sessions.py
index b6fb5bb..8d517ab 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -229,8 +229,10 @@ class Session(object):
         r.send(prefetch=prefetch)
 
         # Send any cookies back up the to the session.
-        for cookie in r.response.cookies:
-            self.cookies.set_cookie(cookie)
+        # (in safe mode, cookies may be None if the request didn't succeed)
+        if r.response.cookies is not None:
+            for cookie in r.response.cookies:
+                self.cookies.set_cookie(cookie)
 
         # Return the response.
         return r.response