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/http/response.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/http/response.py')
| -rw-r--r-- | netlib/http/response.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/netlib/http/response.py b/netlib/http/response.py index ec19640d..30bec2df 100644 --- a/netlib/http/response.py +++ b/netlib/http/response.py @@ -1,6 +1,5 @@ from __future__ import absolute_import, print_function, division -import six import time from email.utils import parsedate_tz, formatdate, mktime_tz from netlib import human @@ -27,13 +26,13 @@ class ResponseData(message.MessageData): timestamp_start=None, timestamp_end=None ): - if isinstance(http_version, six.text_type): + if isinstance(http_version, str): http_version = http_version.encode("ascii", "strict") - if isinstance(reason, six.text_type): + if isinstance(reason, str): reason = reason.encode("ascii", "strict") if not isinstance(headers, nheaders.Headers): headers = nheaders.Headers(headers) - if isinstance(content, six.text_type): + if isinstance(content, str): raise ValueError("Content must be bytes, not {}".format(type(content).__name__)) self.http_version = http_version |