diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-17 15:15:22 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-17 15:18:47 +1300 |
| commit | 8360f70024330eeeb5c53d29e4a05194f872b511 (patch) | |
| tree | 6bbdcfe54fcce1e41660ca07c9470f42debdec5b /mitmproxy/flowfilter.py | |
| parent | 4918feb7252c76c95d85cd8b2b0334a22aaae274 (diff) | |
| download | mitmproxy-8360f70024330eeeb5c53d29e4a05194f872b511.tar.gz mitmproxy-8360f70024330eeeb5c53d29e4a05194f872b511.tar.bz2 mitmproxy-8360f70024330eeeb5c53d29e4a05194f872b511.zip | |
First-order conversion to Python3-only
- Zap various occurrences of Python2 in docs and scripts
- Remove six from netlib, and some other places where obvious project-wide
search and replace works.
Diffstat (limited to 'mitmproxy/flowfilter.py')
| -rw-r--r-- | mitmproxy/flowfilter.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mitmproxy/flowfilter.py b/mitmproxy/flowfilter.py index 27a3212c..7080786f 100644 --- a/mitmproxy/flowfilter.py +++ b/mitmproxy/flowfilter.py @@ -36,7 +36,6 @@ 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 @@ -510,7 +509,7 @@ def match(flt, flow): 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): + if isinstance(flt, str): flt = parse(flt) if not flt: raise ValueError("Invalid filter expression.") |