aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-02-23 17:03:58 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-02-23 17:03:58 +1300
commit2df9c52c097e9d1f7b4ba7f4f66094ef6cf27814 (patch)
tree5344e2d20636e996885d9e3a3b0291b6cf39cdfb /libmproxy/flow.py
parentee8058a2d927491dca165fd578bd8f1e80cb5713 (diff)
downloadmitmproxy-2df9c52c097e9d1f7b4ba7f4f66094ef6cf27814.tar.gz
mitmproxy-2df9c52c097e9d1f7b4ba7f4f66094ef6cf27814.tar.bz2
mitmproxy-2df9c52c097e9d1f7b4ba7f4f66094ef6cf27814.zip
Refactor filter matching.
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index b40daefd..e010883a 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -979,16 +979,8 @@ class Flow:
if matched, False if not.
"""
if f:
- if self.response and f(self.response):
- return True
- elif self.request and f(self.request):
- return True
- elif self.error and f(self.error):
- return True
- else:
- return False
- else:
- return True
+ return f(self)
+ return True
def kill(self, master):
"""