aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-10-13 20:31:14 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-10-13 20:31:14 -0700
commit5fab94580e047aa4b5b7815c6e7d2f8a75931209 (patch)
treee7370ce7b61d6e53af06dc2dafe1aeec32dc2606
parent61a1b96ca4bfa63ddbef65913ccd50b4327f90a6 (diff)
downloadmitmproxy-5fab94580e047aa4b5b7815c6e7d2f8a75931209.tar.gz
mitmproxy-5fab94580e047aa4b5b7815c6e7d2f8a75931209.tar.bz2
mitmproxy-5fab94580e047aa4b5b7815c6e7d2f8a75931209.zip
fix #1605
-rw-r--r--mitmproxy/console/master.py18
1 files changed, 6 insertions, 12 deletions
diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py
index 25776512..16abcb96 100644
--- a/mitmproxy/console/master.py
+++ b/mitmproxy/console/master.py
@@ -685,24 +685,18 @@ class ConsoleMaster(flow.FlowMaster):
# Handlers
@controller.handler
def error(self, f):
- f = flow.FlowMaster.error(self, f)
- if f:
- self.process_flow(f)
- return f
+ super(ConsoleMaster, self).error(f)
+ self.process_flow(f)
@controller.handler
def request(self, f):
- f = flow.FlowMaster.request(self, f)
- if f:
- self.process_flow(f)
- return f
+ super(ConsoleMaster, self).request(f)
+ self.process_flow(f)
@controller.handler
def response(self, f):
- f = flow.FlowMaster.response(self, f)
- if f:
- self.process_flow(f)
- return f
+ super(ConsoleMaster, self).response(f)
+ self.process_flow(f)
@controller.handler
def tcp_message(self, f):