From bdaa13d498b49fa603650f494dca646de3a9367a Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 16 Oct 2016 21:23:04 -0700 Subject: fix merge --- mitmproxy/contrib/tnetstring.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mitmproxy/contrib/tnetstring.py b/mitmproxy/contrib/tnetstring.py index 95157475..65b64058 100644 --- a/mitmproxy/contrib/tnetstring.py +++ b/mitmproxy/contrib/tnetstring.py @@ -183,14 +183,8 @@ def load(file_handle: io.BinaryIO) -> TSerializable: return parse(data_type, data) -<<<<<<< HEAD -def parse(data_type, data): +def parse(data_type: int, data: bytes): # type: (int, bytes) -> TSerializable -======= -def parse(data_type: int, data: bytes) -> TSerializable: - if six.PY2: - data_type = ord(data_type) ->>>>>>> such-types if data_type == ord(b','): return data if data_type == ord(b';'): -- cgit v1.2.3