diff options
| -rw-r--r-- | mitmproxy/contrib/tnetstring.py | 8 |
1 files changed, 1 insertions, 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';'): |