aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/common.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2014-03-10 17:24:05 +1300
committerAldo Cortesi <aldo@corte.si>2014-03-10 17:24:05 +1300
commit554deee222fa4d2100b93becc4dd06f7342e3694 (patch)
tree8acbf873630193e7bc34185f3a243e1aab408869 /libmproxy/console/common.py
parent2e50b1073538730fc5bd6369e2cb8176874f2f03 (diff)
parentdd3aedca01a61f2fe33d009320f7fe656f1fc671 (diff)
downloadmitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.gz
mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.bz2
mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.zip
Merge pull request #233 from mitmproxy/untangle_circular_dependencies
Untangle circular dependencies
Diffstat (limited to 'libmproxy/console/common.py')
-rw-r--r--libmproxy/console/common.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 715bed80..7e2ecbf5 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -1,6 +1,7 @@
import urwid
import urwid.util
-from .. import utils, flow
+from .. import utils
+from ..protocol.http import CONTENT_MISSING
VIEW_LIST = 0
@@ -183,7 +184,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))
- elif f.response.content == flow.CONTENT_MISSING:
+ elif f.response.content == CONTENT_MISSING:
contentdesc = "[content missing]"
else:
contentdesc = "[no content]"