diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 15:35:09 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 15:35:09 +1300 |
| commit | 421679a770c811ceeeccace6310dffcbbe6362dd (patch) | |
| tree | 6bbdcfe54fcce1e41660ca07c9470f42debdec5b /netlib/encoding.py | |
| parent | 4918feb7252c76c95d85cd8b2b0334a22aaae274 (diff) | |
| parent | 8360f70024330eeeb5c53d29e4a05194f872b511 (diff) | |
| download | mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.tar.gz mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.tar.bz2 mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.zip | |
Merge pull request #1613 from cortesi/python3
First-order conversion to Python3-only
Diffstat (limited to 'netlib/encoding.py')
| -rw-r--r-- | netlib/encoding.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/netlib/encoding.py b/netlib/encoding.py index 9b8b3868..f0f7381d 100644 --- a/netlib/encoding.py +++ b/netlib/encoding.py @@ -5,7 +5,6 @@ from __future__ import absolute_import import codecs import collections -import six from io import BytesIO import gzip @@ -91,7 +90,7 @@ def encode(decoded, encoding, errors='strict'): try: try: value = decoded - if not six.PY2 and isinstance(value, six.string_types): + if isinstance(value, str): value = decoded.encode() encoded = custom_encode[encoding](value) except KeyError: |