aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/flow.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-12-16 00:13:18 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-12-16 05:43:38 +0100
commit388fa7e716aa634f841059f50a731c38c71dd36f (patch)
treecfac4930c89934a8a9b50d421e2d57c78b09eaee /mitmproxy/flow.py
parent6b5673e84911f3e2b1599c22c9b4f482a55b9ef1 (diff)
downloadmitmproxy-388fa7e716aa634f841059f50a731c38c71dd36f.tar.gz
mitmproxy-388fa7e716aa634f841059f50a731c38c71dd36f.tar.bz2
mitmproxy-388fa7e716aa634f841059f50a731c38c71dd36f.zip
remove intercept events, update view manually
Diffstat (limited to 'mitmproxy/flow.py')
-rw-r--r--mitmproxy/flow.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/mitmproxy/flow.py b/mitmproxy/flow.py
index 605802c6..7034cb4a 100644
--- a/mitmproxy/flow.py
+++ b/mitmproxy/flow.py
@@ -157,7 +157,7 @@ class Flow(stateobject.StateObject):
def killable(self):
return self.reply and self.reply.state in {"handled", "taken"}
- def kill(self, master):
+ def kill(self):
"""
Kill this request.
"""
@@ -170,9 +170,8 @@ class Flow(stateobject.StateObject):
self.reply.kill(force=True)
self.reply.commit()
self.live = False
- master.addons("kill", self)
- def intercept(self, master):
+ def intercept(self):
"""
Intercept this Flow. Processing will stop until resume is
called.
@@ -181,9 +180,8 @@ class Flow(stateobject.StateObject):
return
self.intercepted = True
self.reply.take()
- master.addons("intercept", self)
- def resume(self, master):
+ def resume(self):
"""
Continue with the flow - called after an intercept().
"""
@@ -192,4 +190,3 @@ class Flow(stateobject.StateObject):
self.intercepted = False
self.reply.ack()
self.reply.commit()
- master.addons("resume", self)