diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-09 21:59:53 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-09 21:59:53 +0100 |
| commit | dd3aedca01a61f2fe33d009320f7fe656f1fc671 (patch) | |
| tree | 8acbf873630193e7bc34185f3a243e1aab408869 /libmproxy/console | |
| parent | 5598a8de82f28232fb4407911a8643dceacc9ebc (diff) | |
| download | mitmproxy-dd3aedca01a61f2fe33d009320f7fe656f1fc671.tar.gz mitmproxy-dd3aedca01a61f2fe33d009320f7fe656f1fc671.tar.bz2 mitmproxy-dd3aedca01a61f2fe33d009320f7fe656f1fc671.zip | |
fix mentions of CONTENT_MISSING in libmproxy.console
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/common.py | 5 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 7 |
2 files changed, 7 insertions, 5 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]" diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 3486f57e..f5b5f83f 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -2,6 +2,7 @@ import os, sys, copy import urwid import common, grideditor, contentview from .. import utils, flow, controller +from ..protocol.http import CONTENT_MISSING class SearchError(Exception): pass @@ -150,7 +151,7 @@ class FlowView(common.WWrap): return (description, text_objects) def cont_view_handle_missing(self, conn, viewmode): - if conn.content == flow.CONTENT_MISSING: + if conn.content == CONTENT_MISSING: msg, body = "", [urwid.Text([("error", "[content missing]")])], 0 else: msg, body = self.content_view(viewmode, conn) @@ -178,7 +179,7 @@ class FlowView(common.WWrap): override = self.override_get() viewmode = self.viewmode_get(override) msg, body = self.cont_view_handle_missing(conn, viewmode) - elif conn.content == flow.CONTENT_MISSING: + elif conn.content == CONTENT_MISSING: pass return headers, msg, body @@ -643,7 +644,7 @@ class FlowView(common.WWrap): def delete_body(self, t): if t == "m": - val = flow.CONTENT_MISSING + val = CONTENT_MISSING else: val = None if self.state.view_flow_mode == common.VIEW_FLOW_REQUEST: |