diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-07-07 17:29:22 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-07 17:29:22 -0700 |
commit | f62e976e1e0245665aeeb08fa801661d6c766ba8 (patch) | |
tree | 78ddb1632756d75aed26a30ada6f0a0a978c06f4 /netlib/http/response.py | |
parent | acca8e5253878d6a346a15a0f64154bdbde49a98 (diff) | |
download | mitmproxy-f62e976e1e0245665aeeb08fa801661d6c766ba8.tar.gz mitmproxy-f62e976e1e0245665aeeb08fa801661d6c766ba8.tar.bz2 mitmproxy-f62e976e1e0245665aeeb08fa801661d6c766ba8.zip |
py3++
Diffstat (limited to 'netlib/http/response.py')
-rw-r--r-- | netlib/http/response.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/netlib/http/response.py b/netlib/http/response.py index 17d69418..7cfb55c8 100644 --- a/netlib/http/response.py +++ b/netlib/http/response.py @@ -2,6 +2,7 @@ from __future__ import absolute_import, print_function, division from email.utils import parsedate_tz, formatdate, mktime_tz import time +import six from netlib.http import cookies from netlib.http import headers as nheaders @@ -13,8 +14,14 @@ from netlib import human class ResponseData(message.MessageData): def __init__(self, http_version, status_code, reason=None, headers=(), content=None, timestamp_start=None, timestamp_end=None): + if isinstance(http_version, six.text_type): + http_version = http_version.encode("ascii", "strict") + if isinstance(reason, six.text_type): + reason = reason.encode("ascii", "strict") if not isinstance(headers, nheaders.Headers): headers = nheaders.Headers(headers) + if isinstance(content, six.text_type): + raise ValueError("Content must be bytes, not {}".format(type(content).__name__)) self.http_version = http_version self.status_code = status_code |