fix crash in safe mode when response.cookies is None
authorShivaram Lingamneni <slingamn@cs.stanford.edu>
Thu, 3 May 2012 08:28:59 +0000 (01:28 -0700)
committerShivaram Lingamneni <slingamn@cs.stanford.edu>
Thu, 3 May 2012 08:29:12 +0000 (01:29 -0700)
requests/sessions.py

index b6fb5bb441cc071463287f4e23d52c6b35f62086..8d517ab5af62d8f8d60900024aba78ad057ff2f2 100644 (file)
@@ -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