diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-05-31 21:03:42 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2016-05-31 21:03:42 +1200 |
| commit | a7abf8b731658b4e7ed8705f7a94a6a62f08d51d (patch) | |
| tree | cb86e2e483530f5e1e8b0c5d60839de21fcf7390 /netlib/websockets/frame.py | |
| parent | 2f526393d29b6a03e43d1f6240175b4dfb13dc7d (diff) | |
| parent | 4da125b6a098cc0fd8b1fd2878584beb5df75c6c (diff) | |
| download | mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.tar.gz mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.tar.bz2 mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.zip | |
Merge pull request #1179 from cortesi/reorg
Start reorganising */utils.py
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): |