diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-15 23:17:57 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-15 23:17:57 -0700 |
| commit | 3602fd7a36d963311339ab11ed36ff00df860f71 (patch) | |
| tree | 5834a98b35c02639c876544bc645f205068fac99 /netlib/http/message.py | |
| parent | a3c7c84d49c3e6563e7f37ef60c989f99ed96788 (diff) | |
| parent | 17305643bc482c0b185eec5c64d506790cd26587 (diff) | |
| download | mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.tar.gz mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.tar.bz2 mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.zip | |
Merge remote-tracking branch 'origin/master' into message-body-encoding
Diffstat (limited to 'netlib/http/message.py')
| -rw-r--r-- | netlib/http/message.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/http/message.py b/netlib/http/message.py index 1252ed25..34709f0a 100644 --- a/netlib/http/message.py +++ b/netlib/http/message.py @@ -263,7 +263,7 @@ class Message(basetypes.Serializable): if strict: raise is_strict = False - decoded = self.content.decode(enc, "replace" if six.PY2 else "surrogateescape") + decoded = self.content.decode("utf8", "replace" if six.PY2 else "surrogateescape") self._text_cache = CachedDecode(content, enc, is_strict, decoded) return self._text_cache.decoded |