From 7a1a40e4455c3ee07bc0860b5e11a43ee2ec7c6e Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 9 Nov 2011 16:25:20 -0800
Subject: [PATCH] ultra cookie compatibility

---
 requests/models.py |  4 ----
 test_requests.py   | 26 ++++++++++++++------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/requests/models.py b/requests/models.py
index 734e0b8..c04e4c5 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -246,11 +246,7 @@ class Request(object):
 
         self.response = r
         self.response.request = self
-        # print locals()
         self.response.cookies.update(self.cookies)
-        # print cookies
-        # print self.response.cookies
-        # print '!!!'
 
 
     @staticmethod
diff --git a/test_requests.py b/test_requests.py
index 8b0f7c7..40fa82e 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -490,11 +490,24 @@ class RequestsTestSuite(unittest.TestCase):
         del _c['bessie']
         assert c == _c
 
-
+        # Test session-level cookies.
         s = requests.session(cookies=_c)
+        r = s.get(httpbin('cookies'))
         c = json.loads(r.content).get('cookies')
         assert c == _c
 
+        # Have the server set a cookie.
+        r = s.get(httpbin('cookies', 'set', 'k', 'v'), allow_redirects=True)
+        c = json.loads(r.content).get('cookies')
+
+        assert 'k' in c
+
+        # And server-set cookie persistience.
+        r = s.get(httpbin('cookies'))
+        c = json.loads(r.content).get('cookies')
+
+        assert 'k' in c
+
 
 
     def test_session_persistent_params(self):
@@ -524,17 +537,6 @@ class RequestsTestSuite(unittest.TestCase):
         assert params3['b'] in r3.content
         assert params3['c'] in r3.content
 
-
-    def test_cookies(self):
-
-        s = requests.session()
-        r = s.get(httpbin('cookies', 'set', 'face', 'book'))
-        # print r.headers
-        # print r.history[0].cookies
-        # print r.content
-        # print r.url
-
-
     def test_invalid_content(self):
 
         # WARNING: if you're using a terrible DNS provider (comcast),
-- 
2.7.4