remove deprecated code

CHANGES.rst

@@ -5,6 +5,44 @@ Version 2.1.0
 
 Unreleased
 
+-   Remove previously deprecated code. :pr:`2276`
+
+    -   Remove the non-standard ``shutdown`` function from the WSGI
+        environ when running the development server. See the docs for
+        alternatives.
+    -   Request and response mixins have all been merged into the
+        ``Request`` and ``Response`` classes.
+    -   The user agent parser and the ``useragents`` module is removed.
+        The ``user_agent`` module provides an interface that can be
+        subclassed to add a parser, such as ua-parser. By default it
+        only stores the whole string.
+    -   The test client returns ``TestResponse`` instances and can no
+        longer be treated as a tuple. All data is available as
+        properties on the response.
+    -   Remove ``locals.get_ident`` and related thread-local code from
+        ``locals``, it no longer makes sense when moving to a
+        contextvars-based implementation.
+    -   Remove the ``python -m werkzeug.serving`` CLI.
+    -   The ``has_key`` method on some mapping datastructures; use
+        ``key in data`` instead.
+    -   ``Request.disable_data_descriptor`` is removed, pass
+        ``shallow=True`` instead.
+    -   Remove the ``no_etag`` parameter from ``Response.freeze()``.
+    -   Remove the ``HTTPException.wrap`` class method.
+    -   Remove the ``cookie_date`` function. Use ``http_date`` instead.
+    -   Remove the ``pbkdf2_hex``, ``pbkdf2_bin``, and ``safe_str_cmp``
+        functions. Use equivalents in ``hashlib`` and ``hmac`` modules
+        instead.
+    -   Remove the ``Href`` class.
+    -   Remove the ``HTMLBuilder`` class.
+    -   Remove the ``invalidate_cached_property`` function. Use
+        ``del obj.attr`` instead.
+    -   Remove ``bind_arguments`` and ``validate_arguments``. Use
+        :meth:`Signature.bind` and :func:`inspect.signature` instead.
+    -   Remove ``detect_utf_encoding``, it's built-in to ``json.loads``.
+    -   Remove ``format_string``, use :class:`string.Template` instead.
+    -   Remove ``escape`` and ``unescape``. Use MarkupSafe instead.
+
 -   Default values passed to ``Headers`` are validated the same way
     values added later are. :issue:`1608`
 -   Setting ``CacheControl`` int properties, such as ``max_age``, will

docs/http.rst

@@ -32,8 +32,6 @@ naive.
 
 .. autofunction:: http_date
 
-.. autofunction:: cookie_date
-
 
 Header Parsing
 ==============

docs/local.rst

@@ -68,7 +68,7 @@ context.
 .. autofunction:: release_local
 
 .. autoclass:: LocalManager
-   :members: cleanup, make_middleware, middleware, get_ident
+   :members: cleanup, make_middleware, middleware
 
 .. autoclass:: LocalStack
    :members: push, pop, top

docs/serving.rst

@@ -148,27 +148,6 @@ technique and should be preferred for security. Another method could be
 to start a :mod:`subprocess` process and send the value back over
 ``stdout``.
 
-.. deprecated:: 2.0
-
-    Shutting down the server with
-    ``environ["werkzeug.server.shutdown"]`` is deprecated and will be
-    removed in Werkzeug 2.1.
-
-The development server provides a way to shutdown the server from a
-request. This will only work with the development server. The
-development server injects a function into the WSGI environ with the
-``"werkzeug.server.shutdown"`` key.
-
-.. code-block:: python
-
-    def shutdown_server(environ):
-        shutdown = environ.get("werkzeug.server.shutdown")
-
-        if shutdown is None:
-            raise RuntimeError("Not running the development server.")
-
-        shutdown()
-
 
 Troubleshooting
 ---------------

docs/utils.rst

@@ -4,27 +4,15 @@ Utilities
 
 Various utility functions shipped with Werkzeug.
 
-
-HTML Helpers
-============
-
 .. module:: werkzeug.utils
 
-.. autoclass:: HTMLBuilder
-
-.. autofunction:: escape
-
-.. autofunction:: unescape
-
 
 General Helpers
 ===============
 
 .. autoclass:: cached_property
    :members:
 
-.. autofunction:: invalidate_cached_property
-
 .. autoclass:: environ_property
 
 .. autoclass:: header_property
@@ -39,12 +27,8 @@ General Helpers
 
 .. autofunction:: find_modules
 
-.. autofunction:: validate_arguments
-
 .. autofunction:: secure_filename
 
-.. autofunction:: bind_arguments
-
 
 URL Helpers
 ===========
@@ -62,41 +46,17 @@ User Agent API
     :member-order: bysource
 
 
-UserAgent Parsing (deprecated)
-==============================
-
-.. module:: werkzeug.useragents
-
-.. deprecated:: 2.0
-    This module will be removed in Werkzeug 2.1. Subclass
-    :class:`werkzeug.user_agent.UserAgent` to use a dedicated parser
-    instead.
-
-.. autoclass:: UserAgent
-    :members:
-    :inherited-members:
-    :member-order: bysource
-
-
 Security Helpers
 ================
 
 .. module:: werkzeug.security
 
-.. versionadded:: 0.6.1
-
 .. autofunction:: generate_password_hash
 
 .. autofunction:: check_password_hash
 
-.. autofunction:: safe_str_cmp
-
 .. autofunction:: safe_join
 
-.. autofunction:: pbkdf2_hex
-
-.. autofunction:: pbkdf2_bin
-
 
 Logging
 =======

src/werkzeug/_internal.py

@@ -1,4 +1,3 @@
-import inspect
 import logging
 import operator
 import re
@@ -225,83 +224,6 @@ def _log(type: str, message: str, *args: t.Any, **kwargs: t.Any) -> None:
     getattr(_logger, type)(message.rstrip(), *args, **kwargs)
 
 
-def _parse_signature(func):  # type: ignore
-    """Return a signature object for the function.
-
-    .. deprecated:: 2.0
-        Will be removed in Werkzeug 2.1 along with ``utils.bind`` and
-        ``validate_arguments``.
-    """
-    # if we have a cached validator for this function, return it
-    parse = _signature_cache.get(func)
-    if parse is not None:
-        return parse
-
-    # inspect the function signature and collect all the information
-    tup = inspect.getfullargspec(func)
-    positional, vararg_var, kwarg_var, defaults = tup[:4]
-    defaults = defaults or ()
-    arg_count = len(positional)
-    arguments = []
-    for idx, name in enumerate(positional):
-        if isinstance(name, list):
-            raise TypeError(
-                "cannot parse functions that unpack tuples in the function signature"
-            )
-        try:
-            default = defaults[idx - arg_count]
-        except IndexError:
-            param = (name, False, None)
-        else:
-            param = (name, True, default)
-        arguments.append(param)
-    arguments = tuple(arguments)
-
-    def parse(args, kwargs):  # type: ignore
-        new_args = []
-        missing = []
-        extra = {}
-
-        # consume as many arguments as positional as possible
-        for idx, (name, has_default, default) in enumerate(arguments):
-            try:
-                new_args.append(args[idx])
-            except IndexError:
-                try:
-                    new_args.append(kwargs.pop(name))
-                except KeyError:
-                    if has_default:
-                        new_args.append(default)
-                    else:
-                        missing.append(name)
-            else:
-                if name in kwargs:
-                    extra[name] = kwargs.pop(name)
-
-        # handle extra arguments
-        extra_positional = args[arg_count:]
-        if vararg_var is not None:
-            new_args.extend(extra_positional)
-            extra_positional = ()
-        if kwargs and kwarg_var is None:
-            extra.update(kwargs)
-            kwargs = {}
-
-        return (
-            new_args,
-            kwargs,
-            missing,
-            extra,
-            extra_positional,
-            arguments,
-            vararg_var,
-            kwarg_var,
-        )
-
-    _signature_cache[func] = parse
-    return parse
-
-
 @typing.overload
 def _dt_as_utc(dt: None) -> None:
     ...

src/werkzeug/datastructures.py

@@ -2,7 +2,6 @@
 import codecs
 import mimetypes
 import re
-import warnings
 from collections.abc import Collection
 from collections.abc import MutableSet
 from copy import deepcopy
@@ -1082,20 +1081,6 @@ def __contains__(self, key):
             return False
         return True
 
-    def has_key(self, key):
-        """
-        .. deprecated:: 2.0
-            Will be removed in Werkzeug 2.1. Use ``key in data``
-            instead.
-        """
-        warnings.warn(
-            "'has_key' is deprecated and will be removed in Werkzeug"
-            " 2.1. Use 'key in data' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return key in self
-
     def __iter__(self):
         """Yield ``(key, value)`` tuples."""
         return iter(self._list)
@@ -1548,20 +1533,6 @@ def __contains__(self, key):
                 return True
         return False
 
-    def has_key(self, key):
-        """
-        .. deprecated:: 2.0
-            Will be removed in Werkzeug 2.1. Use ``key in data``
-            instead.
-        """
-        warnings.warn(
-            "'has_key' is deprecated and will be removed in Werkzeug"
-            " 2.1. Use 'key in data' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return key in self
-
     def __repr__(self):
         return f"{type(self).__name__}({self.dicts!r})"
 
@@ -1991,16 +1962,6 @@ def cache_control_property(key, empty, type):
     )
 
 
-def cache_property(key, empty, type):
-    warnings.warn(
-        "'cache_property' is renamed to 'cache_control_property'. The"
-        " old name is deprecated and will be removed in Werkzeug 2.1.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    return cache_control_property(key, empty, type)
-
-
 class _CacheControl(UpdateDictMixin, dict):
     """Subclass of a dict that stores values for a Cache-Control header.  It
     has accessors for all the cache-control directives specified in RFC 2616.