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.

7 files changed, 9 insertions, 12 deletions

diff --git a/mitmproxy/console/common.py b/mitmproxy/console/common.py
index 25181cb7..e1366c1e 100644
--- a/mitmproxy/console/common.py
+++ b/mitmproxy/console/common.py
@@ -6,7 +6,6 @@ import os
 
 import urwid
 import urwid.util
-import six
 
 import netlib
 from mitmproxy import utils
@@ -39,7 +38,7 @@ def is_keypress(k):
     """
         Is this input event a keypress?
     """
-    if isinstance(k, six.string_types):
+    if isinstance(k, str):
         return True
 
 
@@ -110,7 +109,7 @@ def shortcuts(k):
 
 
 def fcol(s, attr):
-    s = six.text_type(s)
+    s = str(s)
     return (
         "fixed",
         len(s),
diff --git a/mitmproxy/contentviews.py b/mitmproxy/contentviews.py
index f95efb99..83e6a7ad 100644
--- a/mitmproxy/contentviews.py
+++ b/mitmproxy/contentviews.py
@@ -22,7 +22,6 @@ import json
 import logging
 import lxml.etree
 import lxml.html
-import six
 import subprocess
 import traceback
 from PIL import ExifTags
@@ -56,7 +55,7 @@ def pretty_json(s):
     except ValueError:
         return None
     pretty = json.dumps(p, sort_keys=True, indent=4, ensure_ascii=False)
-    if isinstance(pretty, six.text_type):
+    if isinstance(pretty, str):
         # json.dumps _may_ decide to return unicode, if the JSON object is not ascii.
         # From limited testing this is always valid utf8 (otherwise json.loads will fail earlier),
         # so we can just re-encode it here.
diff --git a/mitmproxy/contrib/tnetstring.py b/mitmproxy/contrib/tnetstring.py
index 6c498c75..f5e1d5c1 100644
--- a/mitmproxy/contrib/tnetstring.py
+++ b/mitmproxy/contrib/tnetstring.py
@@ -121,7 +121,7 @@ def _rdumpq(q, size, value):
         write(b':')
         write(span)
         return size + 2 + len(span) + ldata
-    elif isinstance(value, six.text_type):
+    elif isinstance(value, str):
         data = value.encode("utf8")
         ldata = len(data)
         span = str(ldata).encode()
diff --git a/mitmproxy/flow/export.py b/mitmproxy/flow/export.py
index 731aaf0e..eb2d38d2 100644
--- a/mitmproxy/flow/export.py
+++ b/mitmproxy/flow/export.py
@@ -12,10 +12,10 @@ import netlib.http
 
 def _native(s):
     if six.PY2:
-        if isinstance(s, six.text_type):
+        if isinstance(s, str):
             return s.encode()
     else:
-        if isinstance(s, six.binary_type):
+        if isinstance(s, bytes):
             return s.decode()
     return s
 
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.")
diff --git a/mitmproxy/models/connections.py b/mitmproxy/models/connections.py
index a98711a1..9778b7f1 100644
--- a/mitmproxy/models/connections.py
+++ b/mitmproxy/models/connections.py
@@ -205,7 +205,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
         self.wfile.flush()
 
     def establish_ssl(self, clientcerts, sni, **kwargs):
-        if sni and not isinstance(sni, six.string_types):
+        if sni and not isinstance(sni, str):
             raise ValueError("sni must be str, not " + type(sni).__name__)
         clientcert = None
         if clientcerts:
diff --git a/mitmproxy/protocol/tls.py b/mitmproxy/protocol/tls.py
index 943fe837..4792edb8 100644
--- a/mitmproxy/protocol/tls.py
+++ b/mitmproxy/protocol/tls.py
@@ -407,7 +407,7 @@ class TlsLayer(base.Layer):
             self._establish_tls_with_server()
 
     def set_server_tls(self, server_tls, sni=None):
-        # type: (bool, Union[six.text_type, None, False]) -> None
+        # type: (bool, Union[str, None, False]) -> None
         """
         Set the TLS settings for the next server connection that will be established.
         This function will not alter an existing connection.