diff options
Diffstat (limited to 'mitmproxy/models/http.py')
| -rw-r--r-- | mitmproxy/models/http.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mitmproxy/models/http.py b/mitmproxy/models/http.py index 01f5f1ee..1fd28f00 100644 --- a/mitmproxy/models/http.py +++ b/mitmproxy/models/http.py @@ -1,9 +1,10 @@ from __future__ import absolute_import, print_function, division import cgi +import warnings +import six from mitmproxy.models.flow import Flow -from netlib import encoding from netlib import version from netlib.http import Headers from netlib.http import Request @@ -20,10 +21,8 @@ class MessageMixin(object): header. Doesn't change the message iteself or its headers. """ - ce = self.headers.get("content-encoding") - if not self.content or ce not in encoding.ENCODINGS: - return self.content - return encoding.decode(ce, self.content) + warnings.warn(".get_decoded_content() is deprecated, please use .content directly instead.", DeprecationWarning) + return self.content class HTTPRequest(MessageMixin, Request): @@ -220,7 +219,7 @@ class HTTPFlow(Flow): If f is a string, it will be compiled as a filter expression. If the expression is invalid, ValueError is raised. """ - if isinstance(f, basestring): + if isinstance(f, six.string_types): from .. import filt f = filt.parse(f) |