diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-10-16 21:23:04 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-10-16 21:23:04 -0700 |
| commit | bdaa13d498b49fa603650f494dca646de3a9367a (patch) | |
| tree | b72f3f0f13f0c4b0a0eecb806c4b475b4f83c16f /mitmproxy/contrib | |
| parent | 9389601025415c47d5efaa6ac371ddca6d543f48 (diff) | |
| download | mitmproxy-bdaa13d498b49fa603650f494dca646de3a9367a.tar.gz mitmproxy-bdaa13d498b49fa603650f494dca646de3a9367a.tar.bz2 mitmproxy-bdaa13d498b49fa603650f494dca646de3a9367a.zip | |
fix merge
Diffstat (limited to 'mitmproxy/contrib')
| -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';'): |