aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/contentview.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-02 12:09:07 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-02 13:45:19 +1200
commit57a61ae8fd420744d616765d13ad93dec3b3aa52 (patch)
tree06006819f9cb7f67f2f1772fc2c6c6458c1baa35 /libmproxy/console/contentview.py
parent776f0a96693165896bee6251ede42ed642d064bb (diff)
downloadmitmproxy-57a61ae8fd420744d616765d13ad93dec3b3aa52.tar.gz
mitmproxy-57a61ae8fd420744d616765d13ad93dec3b3aa52.tar.bz2
mitmproxy-57a61ae8fd420744d616765d13ad93dec3b3aa52.zip
console: convert add_event to a signal.
Diffstat (limited to 'libmproxy/console/contentview.py')
-rw-r--r--libmproxy/console/contentview.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py
index 2b3c6def..fd28a83a 100644
--- a/libmproxy/console/contentview.py
+++ b/libmproxy/console/contentview.py
@@ -13,7 +13,7 @@ import urwid
import netlib.utils
from netlib import odict
-from . import common
+from . import common, signals
from .. import utils, encoding
from ..contrib import jsbeautifier, html2text
from ..contrib.wbxml.ASCommandResponse import ASCommandResponse
@@ -507,7 +507,7 @@ def get(name):
return i
-def get_content_view(viewmode, hdrItems, content, limit, logfunc, is_request):
+def get_content_view(viewmode, hdrItems, content, limit, is_request):
"""
Returns a (msg, body) tuple.
"""
@@ -532,7 +532,7 @@ def get_content_view(viewmode, hdrItems, content, limit, logfunc, is_request):
except Exception:
s = traceback.format_exc()
s = "Content viewer failed: \n" + s
- logfunc(s, "error")
+ signals.add_event(s, "error")
ret = None
if not ret:
ret = get("Raw")(hdrs, content, limit)