diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:01 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:01 +1200 |
| commit | a061e4587772f4a87eb43d84f2ed358f7cc98fbd (patch) | |
| tree | 1aba05c9d0d6f654fe946897dcb8b5d9127a3de2 /netlib/websockets/frame.py | |
| parent | 06703542037d1c84b0dcb60c6d1c500a0d189e93 (diff) | |
| parent | a7abf8b731658b4e7ed8705f7a94a6a62f08d51d (diff) | |
| download | mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.tar.gz mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.tar.bz2 mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.zip | |
Merge branch 'master' of github.com:cortesi/mitmproxy
Diffstat (limited to 'netlib/websockets/frame.py')
| -rw-r--r-- | netlib/websockets/frame.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py index da5a97f3..cf8917c1 100644 --- a/netlib/websockets/frame.py +++ b/netlib/websockets/frame.py @@ -9,6 +9,7 @@ import six from .protocol import Masker from netlib import tcp from netlib import utils +from netlib import human MAX_16_BIT_INT = (1 << 16) @@ -98,7 +99,7 @@ class FrameHeader(object): if self.masking_key: vals.append(":key=%s" % repr(self.masking_key)) if self.payload_length: - vals.append(" %s" % utils.pretty_size(self.payload_length)) + vals.append(" %s" % human.pretty_size(self.payload_length)) return "".join(vals) def human_readable(self): |