1
0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-09 09:13:23 +00:00

fix python3 compat

This commit is contained in:
Kevin McCarthy
2014-05-03 20:37:53 -10:00
parent d1a3ab56b1
commit 1e8e7057f5
2 changed files with 7 additions and 8 deletions

View File

@@ -55,9 +55,9 @@ def parse_headers(header_list):
def serialize_headers(response): def serialize_headers(response):
out = {} out = {}
for key in response.msg.keys(): for key, values in compat.get_headers(response):
out.setdefault(key, []) out.setdefault(key, [])
out[key].extend(response.msg.getheaders(key)) out[key].extend(values)
return out return out

View File

@@ -28,12 +28,11 @@ def get_header_items(message):
def get_headers(response): def get_headers(response):
for key in response.msg.keys():
if six.PY3: if six.PY3:
header_list = response.msg._headers yield key, response.msg.get_all(key)
return [b': '.join((k.encode('utf-8'), v.encode('utf-8'))) + b'\r\n'
for k, v in header_list]
else: else:
return response.msg.headers yield key, response.msg.getheaders(key)
def get_httpmessage(headers): def get_httpmessage(headers):