conflict resolution

Author: provinzkraut

docs/conf.py

@@ -437,6 +437,6 @@ def delayed_setup(app: Sphinx) -> None:
 
 
 def setup(app: Sphinx) -> dict[str, bool]:
-    app.connect("builder-inited", delayed_setup, priority=0)# type: ignore
+    app.connect("builder-inited", delayed_setup, priority=0)  # type: ignore
     app.setup_extension("litestar_sphinx_theme")
     return {"parallel_read_safe": True, "parallel_write_safe": True}

litestar/handlers/http_handlers/base.py

@@ -658,7 +658,6 @@ def _validate_handler_function(self) -> None:
                 "processed request data, use the 'data' parameter."
             )
 
-
     async def handle(self, connection: Request[Any, Any, Any]) -> None:
         """ASGI app that creates a :class:`~.connection.Request` from the passed in args, determines which handler function to call and then
             handles the call.

litestar/handlers/http_handlers/decorators.py

@@ -589,7 +589,8 @@ def patch(
     name: str | None = None,
     opt: Mapping[str, Any] | None = None,
     request_class: type[Request] | None = None,
-    request_max_body_size: int | None | EmptyType = Empty,response_class: type[Response] | None = None,
+    request_max_body_size: int | None | EmptyType = Empty,
+    response_class: type[Response] | None = None,
     response_cookies: ResponseCookies | None = None,
     response_headers: ResponseHeaders | None = None,
     return_dto: type[AbstractDTO] | None | EmptyType = Empty,
@@ -652,7 +653,8 @@ def patch(
         request_class: A custom subclass of :class:`Request <.connection.Request>` to be used as route handler's
             default request.
         request_max_body_size: Maximum allowed size of the request body in bytes. If this size is exceeded,
-                a '413 - Request Entity Too Large' error response is returned.response_class: A custom subclass of :class:`Response <.response.Response>` to be used as route handler's
+                a '413 - Request Entity Too Large' error response is returned.
+        response_class: A custom subclass of :class:`Response <.response.Response>` to be used as route handler's
             default response.
         response_cookies: A sequence of :class:`Cookie <.datastructures.Cookie>` instances.
         response_headers: A string keyed mapping of :class:`ResponseHeader <.datastructures.ResponseHeader>`
@@ -759,7 +761,8 @@ def post(
     name: str | None = None,
     opt: Mapping[str, Any] | None = None,
     request_class: type[Request] | None = None,
-    request_max_body_size: int | None | EmptyType = Empty,response_class: type[Response] | None = None,
+    request_max_body_size: int | None | EmptyType = Empty,
+    response_class: type[Response] | None = None,
     response_cookies: ResponseCookies | None = None,
     response_headers: ResponseHeaders | None = None,
     return_dto: type[AbstractDTO] | None | EmptyType = Empty,
@@ -822,7 +825,8 @@ def post(
         request_class: A custom subclass of :class:`Request <.connection.Request>` to be used as route handler's
             default request.
         request_max_body_size: Maximum allowed size of the request body in bytes. If this size is exceeded,
-                a '413 - Request Entity Too Large' error response is returned.response_class: A custom subclass of :class:`Response <.response.Response>` to be used as route handler's
+                a '413 - Request Entity Too Large' error response is returned.
+        response_class: A custom subclass of :class:`Response <.response.Response>` to be used as route handler's
             default response.
         response_cookies: A sequence of :class:`Cookie <.datastructures.Cookie>` instances.
         response_headers: A string keyed mapping of :class:`ResponseHeader <.datastructures.ResponseHeader>`
@@ -929,7 +933,8 @@ def put(
     name: str | None = None,
     opt: Mapping[str, Any] | None = None,
     request_class: type[Request] | None = None,
-    request_max_body_size: int | None | EmptyType = Empty,response_class: type[Response] | None = None,
+    request_max_body_size: int | None | EmptyType = Empty,
+    response_class: type[Response] | None = None,
     response_cookies: ResponseCookies | None = None,
     response_headers: ResponseHeaders | None = None,
     return_dto: type[AbstractDTO] | None | EmptyType = Empty,
@@ -992,7 +997,8 @@ def put(
         request_class: A custom subclass of :class:`Request <.connection.Request>` to be used as route handler's
             default request.
         request_max_body_size: Maximum allowed size of the request body in bytes. If this size is exceeded,
-                a '413 - Request Entity Too Large' error response is returned.response_class: A custom subclass of :class:`Response <.response.Response>` to be used as route handler's
+                a '413 - Request Entity Too Large' error response is returned.
+        response_class: A custom subclass of :class:`Response <.response.Response>` to be used as route handler's
             default response.
         response_cookies: A sequence of :class:`Cookie <.datastructures.Cookie>` instances.
         response_headers: A string keyed mapping of :class:`ResponseHeader <.datastructures.ResponseHeader>`

litestar/handlers/websocket_handlers/route_handler.py

@@ -18,7 +18,7 @@
 
 
 class WebsocketRouteHandler(BaseRouteHandler):
-    __slots__ = ("websocket_class", "_kwargs_model")
+    __slots__ = ("_kwargs_model", "websocket_class")
 
     def __init__(
         self,

litestar/types/__init__.py

@@ -97,7 +97,6 @@
     "DataContainerType",
     "DataclassProtocol",
     "Dependencies",
-    "HTTPHandlerDecorator",
     "Empty",
     "EmptyType",
     "ExceptionHandler",
@@ -107,6 +106,7 @@
     "GetLogger",
     "Guard",
     "HTTPDisconnectEvent",
+    "HTTPHandlerDecorator",
     "HTTPReceiveMessage",
     "HTTPRequestEvent",
     "HTTPResponseBodyEvent",