aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/flowview.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-07-31 22:29:13 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-07-31 22:29:13 +0200
commite9401a2123f416f8dd4c24bb4bbc74f297369133 (patch)
treeafebf68d1091d487ef64083962992ea7b703a80e /libmproxy/console/flowview.py
parentf5fb1138fdda77ec4a3bb5493479d2f56cdb0851 (diff)
parent3e3dbee936bb71e813d50937118eebff4ba23617 (diff)
downloadmitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.tar.gz
mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.tar.bz2
mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.zip
Merge branch 'stream'
Conflicts: libmproxy/protocol/http.py
Diffstat (limited to 'libmproxy/console/flowview.py')
-rw-r--r--libmproxy/console/flowview.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index ac10e809..4aaf8944 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -153,7 +153,7 @@ class FlowView(common.WWrap):
def cont_view_handle_missing(self, conn, viewmode):
if conn.content == CONTENT_MISSING:
- msg, body = "", [urwid.Text([("error", "[content missing]")])], 0
+ msg, body = "", [urwid.Text([("error", "[content missing]")])]
else:
msg, body = self.content_view(viewmode, conn)