Remove deprecated code

Author: Archmonger

CHANGELOG.md

@@ -40,6 +40,15 @@ Don't forget to remove deprecated code on each major release!
 
 -   Removed dependency on `aiofile`.
 
+### Removed
+
+-   Removed the following **deprecated** features:
+    -   The `compatibility` argument on `reactpy_django.components.view_to_component`
+    -   `reactpy_django.components.view_to_component` **usage as a decorator**
+    -   `reactpy_django.decorators.auth_required`
+    -   `reactpy_django.REACTPY_WEBSOCKET_PATH`
+    -   `settings.py:REACTPY_WEBSOCKET_URL`
+
 ## [4.0.0] - 2024-06-22
 
 ### Added

src/reactpy_django/__init__.py

@@ -3,7 +3,6 @@
 import nest_asyncio
 
 from reactpy_django import (
-    checks,
     components,
     decorators,
     hooks,
@@ -12,22 +11,17 @@
     types,
     utils,
 )
-from reactpy_django.websocket.paths import (
-    REACTPY_WEBSOCKET_PATH,
-    REACTPY_WEBSOCKET_ROUTE,
-)
+from reactpy_django.websocket.paths import REACTPY_WEBSOCKET_ROUTE
 
 __version__ = "4.0.0"
 __all__ = [
-    "REACTPY_WEBSOCKET_PATH",
     "REACTPY_WEBSOCKET_ROUTE",
     "html",
     "hooks",
     "components",
     "decorators",
     "types",
     "utils",
-    "checks",
     "router",
 ]
 

src/reactpy_django/checks.py

@@ -102,16 +102,7 @@ def reactpy_warnings(app_configs, **kwargs):
 
     # DELETED W007: Check if REACTPY_WEBSOCKET_URL doesn't end with a slash
     # DELETED W008: Check if REACTPY_WEBSOCKET_URL doesn't start with an alphanumeric character
-
-    # Removed REACTPY_WEBSOCKET_URL setting
-    if getattr(settings, "REACTPY_WEBSOCKET_URL", None):
-        warnings.append(
-            Warning(
-                "REACTPY_WEBSOCKET_URL has been removed.",
-                hint="Use REACTPY_URL_PREFIX instead.",
-                id="reactpy_django.W009",
-            )
-        )
+    # DELETED W009: Check if deprecated value REACTPY_WEBSOCKET_URL exists
 
     # Check if REACTPY_URL_PREFIX is being used properly in our HTTP URLs
     with contextlib.suppress(NoReverseMatch):
@@ -158,15 +149,7 @@ def reactpy_warnings(app_configs, **kwargs):
             )
         )
 
-    # Removed REACTPY_RECONNECT_MAX setting
-    if getattr(settings, "REACTPY_RECONNECT_MAX", None):
-        warnings.append(
-            Warning(
-                "REACTPY_RECONNECT_MAX has been removed.",
-                hint="See the docs for the new REACTPY_RECONNECT_* settings.",
-                id="reactpy_django.W013",
-            )
-        )
+    # DELETED W013: Check if deprecated value REACTPY_RECONNECT_MAX exists
 
     if (
         isinstance(config.REACTPY_RECONNECT_INTERVAL, int)

src/reactpy_django/components.py

@@ -2,10 +2,9 @@
 
 import json
 import os
-from typing import Any, Callable, Sequence, Union, cast, overload
+from typing import Any, Callable, Sequence, Union, cast
 from urllib.parse import urlencode
 from uuid import uuid4
-from warnings import warn
 
 from django.contrib.staticfiles.finders import find
 from django.core.cache import caches
@@ -26,40 +25,15 @@
 )
 
 
-# Type hints for:
-#   1. example = view_to_component(my_view, ...)
-#   2. @view_to_component
-@overload
 def view_to_component(
     view: Callable | View | str,
-    compatibility: bool = False,
     transforms: Sequence[Callable[[VdomDict], Any]] = (),
     strict_parsing: bool = True,
-) -> Any: ...
-
-
-# Type hints for:
-#   1. @view_to_component(...)
-@overload
-def view_to_component(
-    view: None = ...,
-    compatibility: bool = False,
-    transforms: Sequence[Callable[[VdomDict], Any]] = (),
-    strict_parsing: bool = True,
-) -> Callable[[Callable], Any]: ...
-
-
-def view_to_component(
-    view: Callable | View | str | None = None,
-    compatibility: bool = False,
-    transforms: Sequence[Callable[[VdomDict], Any]] = (),
-    strict_parsing: bool = True,
-) -> Any | Callable[[Callable], Any]:
+) -> Any:
     """Converts a Django view to a ReactPy component.
 
     Keyword Args:
         view: The view to convert, or the view's dotted path as a string.
-        compatibility: **DEPRECATED.** Use `view_to_iframe` instead.
         transforms: A list of functions that transforms the newly generated VDOM. \
             The functions will be called on each VDOM node.
         strict_parsing: If True, an exception will be generated if the HTML does not \
@@ -69,37 +43,23 @@ def view_to_component(
         A function that takes `request, *args, key, **kwargs` and returns a ReactPy component.
     """
 
-    def decorator(view: Callable | View | str):
-        if not view:
-            raise ValueError("A view must be provided to `view_to_component`")
-
-        def constructor(
-            request: HttpRequest | None = None,
-            *args,
-            key: Key | None = None,
-            **kwargs,
-        ):
-            return _view_to_component(
-                view=view,
-                compatibility=compatibility,
-                transforms=transforms,
-                strict_parsing=strict_parsing,
-                request=request,
-                args=args,
-                kwargs=kwargs,
-                key=key,
-            )
-
-        return constructor
-
-    if not view:
-        warn(
-            "Using `view_to_component` as a decorator is deprecated. "
-            "This functionality will be removed in a future version.",
-            DeprecationWarning,
+    def constructor(
+        request: HttpRequest | None = None,
+        *args,
+        key: Key | None = None,
+        **kwargs,
+    ):
+        return _view_to_component(
+            view=view,
+            transforms=transforms,
+            strict_parsing=strict_parsing,
+            request=request,
+            args=args,
+            kwargs=kwargs,
+            key=key,
         )
 
-    return decorator(view) if view else decorator
+    return constructor
 
 
 def view_to_iframe(
@@ -180,7 +140,6 @@ def pyscript_component(
 @component
 def _view_to_component(
     view: Callable | View | str,
-    compatibility: bool,
     transforms: Sequence[Callable[[VdomDict], Any]],
     strict_parsing: bool,
     request: HttpRequest | None,
@@ -209,10 +168,6 @@ def _view_to_component(
     )
     async def async_render():
         """Render the view in an async hook to avoid blocking the main thread."""
-        # Compatibility mode doesn't require a traditional render
-        if compatibility:
-            return
-
         # Render the view
         response = await render_view(resolved_view, _request, _args, _kwargs)
         set_converted_view(
@@ -224,17 +179,6 @@ async def async_render():
             )
         )
 
-    # Render in compatibility mode, if needed
-    if compatibility:
-        # Warn the user that compatibility mode is deprecated
-        warn(
-            "view_to_component(compatibility=True) is deprecated and will be removed in a future version. "
-            "Please use `view_to_iframe` instead.",
-            DeprecationWarning,
-        )
-
-        return view_to_iframe(resolved_view)(*_args, **_kwargs)
-
     # Return the view if it's been rendered via the `async_render` hook
     return converted_view
 

src/reactpy_django/config.py

@@ -23,19 +23,11 @@
 REACTPY_FAILED_COMPONENTS: set[str] = set()
 REACTPY_REGISTERED_IFRAME_VIEWS: dict[str, Callable | View] = {}
 
-
-# Remove in a future release
-REACTPY_WEBSOCKET_URL = getattr(
-    settings,
-    "REACTPY_WEBSOCKET_URL",
-    "reactpy/",
-)
-
 # Configurable through Django settings.py
 REACTPY_URL_PREFIX: str = getattr(
     settings,
     "REACTPY_URL_PREFIX",
-    REACTPY_WEBSOCKET_URL,
+    "reactpy/",
 ).strip("/")
 REACTPY_SESSION_MAX_AGE: int = getattr(
     settings,

src/reactpy_django/decorators.py

@@ -2,53 +2,17 @@
 
 from functools import wraps
 from typing import TYPE_CHECKING, Any, Callable
-from warnings import warn
 
 from reactpy import component
-from reactpy.core.types import ComponentConstructor, ComponentType, VdomDict
+from reactpy.core.types import ComponentConstructor
 
 from reactpy_django.exceptions import DecoratorParamError
-from reactpy_django.hooks import use_scope, use_user
+from reactpy_django.hooks import use_user
 
 if TYPE_CHECKING:
     from django.contrib.auth.models import AbstractUser
 
 
-def auth_required(
-    component: Callable | None = None,
-    auth_attribute: str = "is_active",
-    fallback: ComponentType | Callable | VdomDict | None = None,
-) -> Callable:
-    """If the user passes authentication criteria, the decorated component will be rendered.
-    Otherwise, the fallback component will be rendered.
-
-    This decorator can be used with or without parentheses.
-
-    Args:
-        auth_attribute: The value to check within the user object. \
-            This is checked in the form of `UserModel.<auth_attribute>`. \
-        fallback: The component or VDOM (`reactpy.html` snippet) to render if the user is not authenticated.
-    """
-
-    warn(
-        "auth_required is deprecated and will be removed in the next major version. "
-        "An equivalent to this decorator's default is @user_passes_test(lambda user: user.is_active).",
-        DeprecationWarning,
-    )
-
-    def decorator(component):
-        @wraps(component)
-        def _wrapped_func(*args, **kwargs):
-            scope = use_scope()
-
-            if getattr(scope["user"], auth_attribute):
-                return component(*args, **kwargs)
-            return fallback(*args, **kwargs) if callable(fallback) else fallback
-
-        return _wrapped_func
-
-    # Return for @authenticated(...) and @authenticated respectively
-    return decorator if component is None else decorator(component)
 
 
 def user_passes_test(

src/reactpy_django/websocket/paths.py

@@ -10,8 +10,6 @@
 )
 """A URL path for :class:`ReactpyAsyncWebsocketConsumer`.
 
-Required since the `reverse()` function does not exist for Django Channels, but we need
-to know the websocket path.
+Required since the `reverse()` function does not exist for Django Channels, but ReactPy needs
+to know the current websocket path.
 """
-
-REACTPY_WEBSOCKET_PATH = REACTPY_WEBSOCKET_ROUTE