aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/contentview.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-01-22 16:01:31 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-01-22 16:01:31 +0100
commit94e530ec4fe4378f89eea44796f31847da52ddf2 (patch)
treee8f30dc5fefd0654e4d700a01e4364f0ea25b8a0 /libmproxy/console/contentview.py
parent1786d778194b543ae77468a716c9e15caf247180 (diff)
parent9044b8b8f534debf84de553bf1e57cd91a08ee91 (diff)
downloadmitmproxy-94e530ec4fe4378f89eea44796f31847da52ddf2.tar.gz
mitmproxy-94e530ec4fe4378f89eea44796f31847da52ddf2.tar.bz2
mitmproxy-94e530ec4fe4378f89eea44796f31847da52ddf2.zip
merge master
Diffstat (limited to 'libmproxy/console/contentview.py')
-rw-r--r--libmproxy/console/contentview.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py
index a5cb679e..d39d1b9c 100644
--- a/libmproxy/console/contentview.py
+++ b/libmproxy/console/contentview.py
@@ -490,7 +490,7 @@ def get_content_view(viewmode, hdrItems, content, limit, logfunc):
try:
ret = viewmode(hdrs, content, limit)
# Third-party viewers can fail in unexpected ways...
- except Exception, e:
+ except Exception:
s = traceback.format_exc()
s = "Content viewer failed: \n" + s
logfunc(s)