Remove deprecated interfaces

2 files changed, 0 insertions, 32 deletions

diff --git a/mitmproxy/net/http/__init__.py b/mitmproxy/net/http/__init__.py
index 7e290bdc..fd976cd8 100644
--- a/mitmproxy/net/http/__init__.py
+++ b/mitmproxy/net/http/__init__.py
@@ -2,7 +2,6 @@ from mitmproxy.net.http.request import Request
 from mitmproxy.net.http.response import Response
 from mitmproxy.net.http.message import Message
 from mitmproxy.net.http.headers import Headers, parse_content_type
-from mitmproxy.net.http.message import decoded
 from mitmproxy.net.http import http1, http2, status_codes, multipart
 
 __all__ = [
@@ -10,6 +9,5 @@ __all__ = [
     "Response",
     "Message",
     "Headers", "parse_content_type",
-    "decoded",
     "http1", "http2", "status_codes", "multipart",
 ]
diff --git a/mitmproxy/net/http/message.py b/mitmproxy/net/http/message.py
index af1d16be..3a243070 100644
--- a/mitmproxy/net/http/message.py
+++ b/mitmproxy/net/http/message.py
@@ -1,5 +1,4 @@
 import re
-import warnings
 from typing import Optional
 
 from mitmproxy.utils import strutils
@@ -269,32 +268,3 @@ class Message(serializable.Serializable):
             )
         replacements += self.headers.replace(pattern, repl, flags=flags, count=count)
         return replacements
-
-    # Legacy
-
-    @property
-    def body(self):  # pragma: no cover
-        warnings.warn(".body is deprecated, use .content instead.", DeprecationWarning)
-        return self.content
-
-    @body.setter
-    def body(self, body):  # pragma: no cover
-        warnings.warn(".body is deprecated, use .content instead.", DeprecationWarning)
-        self.content = body
-
-
-class decoded:
-    """
-    Deprecated: You can now directly use :py:attr:`content`.
-    :py:attr:`raw_content` has the encoded content.
-    """
-
-    def __init__(self, message):  # pragma no cover
-        warnings.warn("decoded() is deprecated, you can now directly use .content instead. "
-                      ".raw_content has the encoded content.", DeprecationWarning)
-
-    def __enter__(self):  # pragma no cover
-        pass
-
-    def __exit__(self, type, value, tb):  # pragma no cover
-        pass