diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2015-05-31 17:24:44 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2015-05-31 17:24:44 +1200 |
commit | 35856ead075829d5b086e60c60ac20fdfc8560f1 (patch) | |
tree | c03ef9662a18145725467311ed373f1229be4390 /netlib/websockets.py | |
parent | f7bd690e3aba0be05c30a3b9a4d499de8dbd5e06 (diff) | |
download | mitmproxy-35856ead075829d5b086e60c60ac20fdfc8560f1.tar.gz mitmproxy-35856ead075829d5b086e60c60ac20fdfc8560f1.tar.bz2 mitmproxy-35856ead075829d5b086e60c60ac20fdfc8560f1.zip |
websockets: nicer human readable
Diffstat (limited to 'netlib/websockets.py')
-rw-r--r-- | netlib/websockets.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/netlib/websockets.py b/netlib/websockets.py index 63dc03f1..bf920897 100644 --- a/netlib/websockets.py +++ b/netlib/websockets.py @@ -175,7 +175,7 @@ class FrameHeader: def human_readable(self): vals = [ - "wf:", + "ws frame:", OPCODE.get_name(self.opcode, hex(self.opcode)).lower() ] flags = [] @@ -327,8 +327,10 @@ class Frame(object): return cls.from_file(tcp.Reader(io.BytesIO(bytestring))) def human_readable(self): - hdr = self.header.human_readable() - return hdr + "\n" + repr(self.payload) + ret = self.header.human_readable() + if self.payload: + ret = ret + "\nPayload:\n" + utils.cleanBin(self.payload) + return ret def to_bytes(self): """ |