aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-05-29 13:33:20 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-05-29 13:43:20 +0200
commite2447406cc89c5a9c3e20f1faf4f5bb9fd2f55b7 (patch)
treeb37af6f7e7658aa8d4851fde80928475840921f3 /mitmproxy
parent5c45ca7f9aba05849bd8db24bb58c1951f79e630 (diff)
downloadmitmproxy-e2447406cc89c5a9c3e20f1faf4f5bb9fd2f55b7.tar.gz
mitmproxy-e2447406cc89c5a9c3e20f1faf4f5bb9fd2f55b7.tar.bz2
mitmproxy-e2447406cc89c5a9c3e20f1faf4f5bb9fd2f55b7.zip
more style cleanup
Diffstat (limited to 'mitmproxy')
-rw-r--r--mitmproxy/controller.py2
-rw-r--r--mitmproxy/version.py7
-rw-r--r--mitmproxy/web/app.py3
3 files changed, 10 insertions, 2 deletions
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py
index 3afc70a8..e48f90e9 100644
--- a/mitmproxy/controller.py
+++ b/mitmproxy/controller.py
@@ -174,7 +174,7 @@ def handler(f):
raise exceptions.ControlException("Handler takes one argument: a message")
if not hasattr(message, "reply"):
- raise exceptions.ControlException("Message %s has no reply attribute"%message)
+ raise exceptions.ControlException("Message %s has no reply attribute" % message)
# The following ensures that inheritance with wrapped handlers in the
# base class works. If we're the first handler, then responsibility for
diff --git a/mitmproxy/version.py b/mitmproxy/version.py
index da1e7229..02b0d900 100644
--- a/mitmproxy/version.py
+++ b/mitmproxy/version.py
@@ -4,3 +4,10 @@ from netlib.version import VERSION, IVERSION
NAME = "mitmproxy"
NAMEVERSION = NAME + " " + VERSION
+
+__all__ = [
+ "NAME",
+ "NAMEVERSION",
+ "VERSION",
+ "IVERSION",
+]
diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py
index 23a77cb0..df235ee1 100644
--- a/mitmproxy/web/app.py
+++ b/mitmproxy/web/app.py
@@ -112,7 +112,8 @@ class RequestHandler(BasicAuth, tornado.web.RequestHandler):
class IndexHandler(RequestHandler):
def get(self):
- _ = self.xsrf_token # https://github.com/tornadoweb/tornado/issues/645
+ token = self.xsrf_token # https://github.com/tornadoweb/tornado/issues/645
+ assert token
self.render("index.html")