aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/common.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-05-01 17:25:00 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-05-01 17:25:00 +0200
commitc780fc7bdf818ce1a445b526ff3e5afc6c05807f (patch)
tree646f9051b3f89204af3c03edcf51ad4e7711acc0 /libmproxy/console/common.py
parent3f5ca10c39a9f7d55e0f6943caf8f6ff762a0222 (diff)
parent1c26516b1822d82e3b701539591a1d22831e0a19 (diff)
downloadmitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.tar.gz
mitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.tar.bz2
mitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/console/common.py')
-rw-r--r--libmproxy/console/common.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index ba6ba5b0..b920a11f 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -7,6 +7,7 @@ import os
from .. import utils
from ..protocol.http import CONTENT_MISSING, decoded
from . import signals
+import netlib.utils
try:
import pyperclip
@@ -379,7 +380,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2):
)
if f.response:
if f.response.content:
- contentdesc = utils.pretty_size(len(f.response.content))
+ contentdesc = netlib.utils.pretty_size(len(f.response.content))
elif f.response.content == CONTENT_MISSING:
contentdesc = "[content missing]"
else: