From 8360f70024330eeeb5c53d29e4a05194f872b511 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 15:15:22 +1300 Subject: 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. --- mitmproxy/flowfilter.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mitmproxy/flowfilter.py') 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.") -- cgit v1.2.3