diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-19 18:16:24 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-19 18:16:24 +1300 |
| commit | 7ddc941116852b191d80643af70af90a6fd8849c (patch) | |
| tree | 2baafd3e82de6e056f6290d457d770dcc9814db2 /libmproxy/console | |
| parent | cabd848b1e349242d611aa581fe04b1192dab7e8 (diff) | |
| download | mitmproxy-7ddc941116852b191d80643af70af90a6fd8849c.tar.gz mitmproxy-7ddc941116852b191d80643af70af90a6fd8849c.tar.bz2 mitmproxy-7ddc941116852b191d80643af70af90a6fd8849c.zip | |
Silence pyflakes
And pick up one bug as a consequence.
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/contentview.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 536b0bac..a316602c 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -1,7 +1,7 @@ import mailcap, mimetypes, tempfile, os, subprocess, glob, time, shlex, stat import os.path, sys, weakref import urwid -from .. import controller, utils, flow +from .. import controller, utils, flow, script import flowlist, flowview, help, common, grideditor, palettes, contentview, flowdetailview EVENTLOG_SIZE = 500 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) |