Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 18:18:25 +00:00
Code Issues Projects Releases Wiki Activity

fix mentions of CONTENT_MISSING in libmproxy.console

Browse Source
This commit is contained in:
Maximilian Hils 2014-03-09 21:59:53 +01:00
parent 5598a8de82
commit dd3aedca01
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmproxy/console/common.py
View File

@ -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]"

7
libmproxy/console/flowview.py
View File

@ -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: