Merge remote-tracking branch 'origin/pr/59'

betamax/cassette/interaction.py

@@ -1,5 +1,6 @@
 from .util import (deserialize_response, deserialize_prepared_request,
                    from_list)
+from requests.cookies import extract_cookies_to_jar
 from datetime import datetime
 
 
@@ -34,6 +35,7 @@ def deserialize(self):
         """Turn a serialized interaction into a Response."""
         r = deserialize_response(self.json['response'])
         r.request = deserialize_prepared_request(self.json['request'])
+        extract_cookies_to_jar(r.cookies, r.request, r.raw)
         self.recorded_at = datetime.strptime(
             self.json['recorded_at'], '%Y-%m-%dT%H:%M:%S'
         )

betamax/cassette/mock_response.py

@@ -1,6 +1,5 @@
-import re
-
 from email import parser, message
+import sys
 
 
 class MockHTTPResponse(object):
@@ -10,6 +9,8 @@ def __init__(self, headers):
         h = ["%s: %s" % (k, v) for (k, v) in headers.items()]
         h = map(coerce_content, h)
         h = '\r\n'.join(h)
+        if sys.version_info < (2, 7):
+            h = h.encode()
         p = parser.Parser(EmailMessage)
         # Thanks to Python 3, we have to use the slightly more awful API below
         # mimetools was deprecated so we have to use email.message.Message
@@ -23,4 +24,4 @@ def isclosed(self):
 
 class EmailMessage(message.Message):
     def getheaders(self, value, *args):
-        return re.split(b', ', self.get(value, b'', *args))
+        return self.get_all(value, [])

tests/unit/test_cassette.py

@@ -338,6 +338,13 @@ def check_uri(attr):
         headers = dict((k, v[0]) for k, v in self.response['headers'].items())
         assert headers == r.headers
 
+        tested_cookie = False
+        for cookie in r.cookies:
+            cookie_str = "{0}={1}".format(cookie.name, cookie.value)
+            assert cookie_str == r.headers['Set-Cookie']
+            tested_cookie = True
+        assert tested_cookie
+
         assert self.response['body']['string'] == decode(r.content)
         actual_req = r.request
         expected_req = self.request