diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-11 13:37:52 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-11 13:37:52 +0200 |
commit | 960f62f3630b48ee3b43ae9289e8e0b33659fe64 (patch) | |
tree | 3f08356a94163af38b565c0500cbaede6a6222d5 /libmproxy/console/flowview.py | |
parent | 625a719eb1237556d4aa2ed3e0088634324c0ad9 (diff) | |
download | mitmproxy-960f62f3630b48ee3b43ae9289e8e0b33659fe64.tar.gz mitmproxy-960f62f3630b48ee3b43ae9289e8e0b33659fe64.tar.bz2 mitmproxy-960f62f3630b48ee3b43ae9289e8e0b33659fe64.zip |
fix bugs
Diffstat (limited to 'libmproxy/console/flowview.py')
-rw-r--r-- | libmproxy/console/flowview.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 4946ed9c..c0720652 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -181,7 +181,7 @@ class FlowView(tabs.Tabs): limit = sys.maxsize else: limit = contentview.VIEW_CUTOFF - description, text_objects = cache.get( + return cache.get( self._get_content_view, viewmode, conn.headers, @@ -189,21 +189,21 @@ class FlowView(tabs.Tabs): limit, isinstance(conn, HTTPRequest) ) - return (description, text_objects) def _get_content_view(self, viewmode, headers, content, limit, is_request): try: - return contentview.get_content_view( + description, lines = contentview.get_content_view( viewmode, headers, content, limit, is_request ) except ContentViewException: s = "Content viewer failed: \n" + traceback.format_exc() signals.add_event(s, "error") - msg, view = contentview.get_content_view( + description, lines = contentview.get_content_view( viewmode, headers, content, limit, is_request ) - msg = msg.replace("Raw", "Couldn't parse: falling back to Raw") - return msg, view + description = description.replace("Raw", "Couldn't parse: falling back to Raw") + text_objects = [urwid.Text(l) for l in lines] + return description, text_objects def viewmode_get(self): override = self.state.get_flow_setting( |