Rename handler modules to disambiguate from decorator names.

Closes #1162

starlite/app.py

@@ -28,7 +28,7 @@
     ImproperlyConfiguredException,
     NoRouteMatchFoundException,
 )
-from starlite.handlers.http import HTTPRouteHandler
+from starlite.handlers.http_handlers import HTTPRouteHandler
 from starlite.middleware.cors import CORSMiddleware
 from starlite.openapi.path_item import create_path_item
 from starlite.router import Router

starlite/connection/request.py

@@ -17,7 +17,7 @@
 from starlite.utils.serialization import decode_json, decode_msgpack
 
 if TYPE_CHECKING:
-    from starlite.handlers.http import HTTPRouteHandler  # noqa: F401
+    from starlite.handlers.http_handlers import HTTPRouteHandler  # noqa: F401
     from starlite.types.asgi_types import HTTPScope, Method, Receive, Scope, Send
 
 

starlite/connection/websocket.py

@@ -26,7 +26,7 @@
 from starlite.utils.serialization import decode_json, default_serializer, encode_json
 
 if TYPE_CHECKING:
-    from starlite.handlers.websocket import WebsocketRouteHandler  # noqa: F401
+    from starlite.handlers.websocket_handlers import WebsocketRouteHandler  # noqa: F401
     from starlite.types import Message, Serializer, WebSocketScope
     from starlite.types.asgi_types import WebSocketDisconnectEvent  # nopycln: import
     from starlite.types.asgi_types import WebSocketReceiveEvent  # nopycln: import

starlite/handlers/__init__.py

@@ -1,7 +1,7 @@
-from .asgi import ASGIRouteHandler, asgi
+from .asgi_handlers import ASGIRouteHandler, asgi
 from .base import BaseRouteHandler
-from .http import HTTPRouteHandler, delete, get, head, patch, post, put, route
-from .websocket import WebsocketRouteHandler, websocket
+from .http_handlers import HTTPRouteHandler, delete, get, head, patch, post, put, route
+from .websocket_handlers import WebsocketRouteHandler, websocket
 
 __all__ = (
     "ASGIRouteHandler",

starlite/routes/asgi.py

@@ -6,7 +6,7 @@
 from starlite.utils.helpers import unwrap_partial
 
 if TYPE_CHECKING:
-    from starlite.handlers.asgi import ASGIRouteHandler
+    from starlite.handlers.asgi_handlers import ASGIRouteHandler
     from starlite.types import Receive, Scope, Send
 
 

starlite/routes/http.py

@@ -11,7 +11,7 @@
     ImproperlyConfiguredException,
     SerializationException,
 )
-from starlite.handlers.http import HTTPRouteHandler
+from starlite.handlers.http_handlers import HTTPRouteHandler
 from starlite.response import Response
 from starlite.routes.base import BaseRoute
 from starlite.status_codes import HTTP_204_NO_CONTENT, HTTP_400_BAD_REQUEST

starlite/routes/websocket.py

@@ -6,7 +6,7 @@
 
 if TYPE_CHECKING:
     from starlite.connection import WebSocket
-    from starlite.handlers.websocket import WebsocketRouteHandler
+    from starlite.handlers.websocket_handlers import WebsocketRouteHandler
     from starlite.kwargs import KwargsModel
     from starlite.kwargs.cleanup import DependencyCleanupGroup
     from starlite.types import Receive, Send, WebSocketScope

starlite/testing/request_factory.py

@@ -9,7 +9,7 @@
 from starlite.app import Starlite
 from starlite.connection import Request
 from starlite.enums import HttpMethod, ParamType, RequestEncodingType, ScopeType
-from starlite.handlers.http import get
+from starlite.handlers.http_handlers import get
 from starlite.types import HTTPScope, RouteHandlerType
 from starlite.types.asgi_types import ASGIVersion
 from starlite.utils.serialization import decode_json, encode_json

starlite/types/internal_types.py

@@ -15,9 +15,9 @@
 if TYPE_CHECKING:
     from starlite.app import Starlite
     from starlite.controller import Controller
-    from starlite.handlers.asgi import ASGIRouteHandler
-    from starlite.handlers.http import HTTPRouteHandler
-    from starlite.handlers.websocket import WebsocketRouteHandler
+    from starlite.handlers.asgi_handlers import ASGIRouteHandler
+    from starlite.handlers.http_handlers import HTTPRouteHandler
+    from starlite.handlers.websocket_handlers import WebsocketRouteHandler
     from starlite.response import Response
     from starlite.router import Router
 else:

tests/connection/websocket/test_websocket.py

@@ -12,7 +12,7 @@
 from starlite.connection import WebSocket
 from starlite.datastructures.headers import Headers
 from starlite.exceptions import WebSocketDisconnect, WebSocketException
-from starlite.handlers.websocket import websocket
+from starlite.handlers.websocket_handlers import websocket
 from starlite.status_codes import WS_1001_GOING_AWAY
 from starlite.testing import TestClient, create_test_client
 

tests/handlers/http/test_kwarg_handling.py

@@ -16,7 +16,7 @@
     put,
 )
 from starlite.exceptions import ImproperlyConfiguredException
-from starlite.handlers.http import _get_default_status_code
+from starlite.handlers.http_handlers import _get_default_status_code
 from starlite.status_codes import HTTP_200_OK, HTTP_201_CREATED, HTTP_204_NO_CONTENT
 from starlite.types import ResponseType
 from starlite.utils import normalize_path

tests/plugins/tortoise_orm/__init__.py

@@ -2,7 +2,7 @@
 
 from tortoise import Model, Tortoise, fields  # type: ignore
 
-from starlite.handlers.http import get, post
+from starlite.handlers.http_handlers import get, post
 
 
 class Tournament(Model):  # type: ignore[misc]