aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/controller.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-17 17:11:21 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-17 17:37:08 +1300
commitfb22f2ff4f75783ba786935c93b75f372ede21f5 (patch)
treea7055ebd090e11b163efa81b86086b7f88ca89e6 /mitmproxy/controller.py
parent666c59cbfbcbd28062c201c3cb5d6cb928e90aee (diff)
downloadmitmproxy-fb22f2ff4f75783ba786935c93b75f372ede21f5.tar.gz
mitmproxy-fb22f2ff4f75783ba786935c93b75f372ede21f5.tar.bz2
mitmproxy-fb22f2ff4f75783ba786935c93b75f372ede21f5.zip
Zap object base class
Diffstat (limited to 'mitmproxy/controller.py')
-rw-r--r--mitmproxy/controller.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py
index 579cf92d..397c906d 100644
--- a/mitmproxy/controller.py
+++ b/mitmproxy/controller.py
@@ -41,13 +41,13 @@ Events = frozenset([
])
-class LogEntry(object):
+class LogEntry():
def __init__(self, msg, level):
self.msg = msg
self.level = level
-class Log(object):
+class Log():
"""
The central logger, exposed to scripts as mitmproxy.ctx.log.
"""
@@ -82,7 +82,7 @@ class Log(object):
self.master.add_log(text, level)
-class Master(object):
+class Master():
"""
The master handles mitmproxy's main event loop.
"""
@@ -185,7 +185,7 @@ class ServerThread(basethread.BaseThread):
self.server.serve_forever()
-class Channel(object):
+class Channel():
"""
The only way for the proxy server to communicate with the master
is to use the channel it has been given.
@@ -272,7 +272,7 @@ def handler(f):
NO_REPLY = object() # special object we can distinguish from a valid "None" reply.
-class Reply(object):
+class Reply():
"""
Messages sent through a channel are decorated with a "reply" attribute.
This object is used to respond to the message through the return