aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/flowfilter.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-10-01 12:32:56 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-10-03 11:45:54 +0200
commit5f8b8bf35e7a8c434310c93c13871f863f12fecc (patch)
tree1adbec32cb8b6306c254cf34b50c7a6833b3a146 /mitmproxy/flowfilter.py
parentba842489103caba2691084a1f32f3c79f8f564d6 (diff)
downloadmitmproxy-5f8b8bf35e7a8c434310c93c13871f863f12fecc.tar.gz
mitmproxy-5f8b8bf35e7a8c434310c93c13871f863f12fecc.tar.bz2
mitmproxy-5f8b8bf35e7a8c434310c93c13871f863f12fecc.zip
move flow.match to flowfilter.match
Diffstat (limited to 'mitmproxy/flowfilter.py')
-rw-r--r--mitmproxy/flowfilter.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/flowfilter.py b/mitmproxy/flowfilter.py
index a6398957..6ca74b68 100644
--- a/mitmproxy/flowfilter.py
+++ b/mitmproxy/flowfilter.py
@@ -36,6 +36,7 @@ from __future__ import absolute_import, print_function, division
import re
import sys
import functools
+import six
from mitmproxy.models.http import HTTPFlow
from mitmproxy.models.tcp import TCPFlow
@@ -501,16 +502,15 @@ def parse(s):
return None
-def match(self, flow, flt):
+def match(flow, flt):
"""
- Match a flow against a compiled filter expression.
+ Matches a flow against a compiled filter expression.
Returns True if matched, False if not.
If flt is a string, it will be compiled as a filter expression.
If the expression is invalid, ValueError is raised.
"""
if isinstance(flt, six.string_types):
-
flt = parse(flt)
if not flt:
raise ValueError("Invalid filter expression.")