Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge

This commit is contained in:
Maximilian Hils 2016-10-16 21:23:04 -07:00
parent 9389601025
commit bdaa13d498
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mitmproxy/contrib/tnetstring.py
View File

@ -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';'):