diff options
author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-07-03 19:04:16 +0200 |
---|---|---|
committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-07-03 23:22:04 +0200 |
commit | 23e295b37eb3aee9ebe7c88cc1ebb1dc2ffa9cf2 (patch) | |
tree | 3d8876500f6c0ae57ecb1905294138b6c56043b5 | |
parent | 45aa2174e235f542d75d0305e7fb498b9b0585f9 (diff) | |
download | mitmproxy-23e295b37eb3aee9ebe7c88cc1ebb1dc2ffa9cf2.tar.gz mitmproxy-23e295b37eb3aee9ebe7c88cc1ebb1dc2ffa9cf2.tar.bz2 mitmproxy-23e295b37eb3aee9ebe7c88cc1ebb1dc2ffa9cf2.zip |
py3: fix bytes vs. str
-rw-r--r-- | netlib/http/http2/utils.py | 8 | ||||
-rw-r--r-- | pathod/protocols/http2.py | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/netlib/http/http2/utils.py b/netlib/http/http2/utils.py index 4d5f580c..4c01952d 100644 --- a/netlib/http/http2/utils.py +++ b/netlib/http/http2/utils.py @@ -2,10 +2,10 @@ from netlib.http import url def parse_headers(headers): - authority = headers.get(':authority', b'') - method = headers.get(':method', b'GET') - scheme = headers.get(':scheme', b'https') - path = headers.get(':path', b'/') + authority = headers.get(':authority', '').encode() + method = headers.get(':method', 'GET').encode() + scheme = headers.get(':scheme', 'https').encode() + path = headers.get(':path', '/').encode() headers.clear(":method") headers.clear(":scheme") diff --git a/pathod/protocols/http2.py b/pathod/protocols/http2.py index d94cd981..5ad120de 100644 --- a/pathod/protocols/http2.py +++ b/pathod/protocols/http2.py @@ -181,10 +181,10 @@ class HTTP2StateProtocol(object): headers = request.headers.copy() if ':authority' not in headers: - headers.insert(0, b':authority', authority.encode('ascii')) - headers.insert(0, b':scheme', request.scheme.encode('ascii')) - headers.insert(0, b':path', request.path.encode('ascii')) - headers.insert(0, b':method', request.method.encode('ascii')) + headers.insert(0, ':authority', authority) + headers.insert(0, ':scheme', request.scheme) + headers.insert(0, ':path', request.path) + headers.insert(0, ':method', request.method) if hasattr(request, 'stream_id'): stream_id = request.stream_id @@ -397,7 +397,7 @@ class HTTP2StateProtocol(object): self._handle_unexpected_frame(frm) headers = netlib.http.headers.Headers( - (k.encode('ascii'), v.encode('ascii')) for k, v in self.decoder.decode(header_blocks) + [[k, v] for k, v in self.decoder.decode(header_blocks, raw=True)] ) return stream_id, headers, body |