diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-10-16 21:33:24 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-10-16 21:33:24 -0700 |
| commit | 666c59cbfbcbd28062c201c3cb5d6cb928e90aee (patch) | |
| tree | 1d74a764e3dd77595732531624cb631a7af33c9e /mitmproxy/contrib | |
| parent | bdaa13d498b49fa603650f494dca646de3a9367a (diff) | |
| download | mitmproxy-666c59cbfbcbd28062c201c3cb5d6cb928e90aee.tar.gz mitmproxy-666c59cbfbcbd28062c201c3cb5d6cb928e90aee.tar.bz2 mitmproxy-666c59cbfbcbd28062c201c3cb5d6cb928e90aee.zip | |
actually fix merge :see_no_evil:
Diffstat (limited to 'mitmproxy/contrib')
| -rw-r--r-- | mitmproxy/contrib/tnetstring.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mitmproxy/contrib/tnetstring.py b/mitmproxy/contrib/tnetstring.py index 65b64058..24ce6ce8 100644 --- a/mitmproxy/contrib/tnetstring.py +++ b/mitmproxy/contrib/tnetstring.py @@ -183,8 +183,7 @@ def load(file_handle: io.BinaryIO) -> TSerializable: return parse(data_type, data) -def parse(data_type: int, data: bytes): - # type: (int, bytes) -> TSerializable +def parse(data_type: int, data: bytes) -> TSerializable: if data_type == ord(b','): return data if data_type == ord(b';'): |