Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions requests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,19 @@ class Response(object):
server's response to an HTTP request.
"""

__attrs__ = [
'_content',
'status_code',
'headers',
'url',
'history',
'encoding',
'reason',
'cookies',
'elapsed',
'request',
]

def __init__(self):
super(Response, self).__init__()

Expand Down Expand Up @@ -528,6 +541,24 @@ def __init__(self):
#: and the arrival of the response (as a timedelta)
self.elapsed = datetime.timedelta(0)

def __getstate__(self):
# Consume everything; accessing the content attribute makes
# sure the content has been fully read.
if not self._content_consumed:
self.content

return dict(
(attr, getattr(self, attr, None))
for attr in self.__attrs__
)

def __setstate__(self, state):
for name, value in state.items():
setattr(self, name, value)

# pickled objects do not have .raw
setattr(self, '_content_consumed', True)

def __repr__(self):
return '<Response [%s]>' % (self.status_code)

Expand Down
14 changes: 13 additions & 1 deletion test_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ def test_unicode_multipart_post_fieldnames(self):
prep = r.prepare()
assert b'name="stuff"' in prep.body
assert b'name="b\'stuff\'"' not in prep.body

def test_unicode_method_name(self):
files = {'file': open('test_requests.py', 'rb')}
r = requests.request(method=u'POST', url=httpbin('post'), files=files)
Expand Down Expand Up @@ -547,6 +547,18 @@ def read_mock(amt, decode_content=None):
assert next(iter(r))
io.close()

def test_request_and_response_are_pickleable(self):
r = requests.get(httpbin('get'))

# verify we can pickle the original request
assert pickle.loads(pickle.dumps(r.request))

# verify we can pickle the response and that we have access to
# the original request.
pr = pickle.loads(pickle.dumps(r))
assert r.request.url == pr.request.url
assert r.request.headers == pr.request.headers

def test_get_auth_from_url(self):
url = 'http://user:pass@complex.url.com/path?query=yes'
assert ('user', 'pass') == requests.utils.get_auth_from_url(url)
Expand Down