Skip to content

Commit 7bfb304

Browse files
authored
Merge pull request #63 from eadwinCode/fix_session_middleware_dependencies
fix itsdangerous session middleware bug
2 parents ea7f7c5 + 8636bca commit 7bfb304

File tree

9 files changed

+8
-11
lines changed

9 files changed

+8
-11
lines changed

ellar/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""Ellar - Python ASGI web framework for building fast, efficient and scalable RESTAPIs and server-side application."""
22

3-
__version__ = "0.3.0"
3+
__version__ = "0.3.2"

ellar/core/middleware/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from starlette.middleware.httpsredirect import (
77
HTTPSRedirectMiddleware as HTTPSRedirectMiddleware,
88
)
9-
from starlette.middleware.sessions import SessionMiddleware as SessionMiddleware
109
from starlette.middleware.trustedhost import (
1110
TrustedHostMiddleware as TrustedHostMiddleware,
1211
)
@@ -30,5 +29,4 @@
3029
"WSGIMiddleware",
3130
"RequestVersioningMiddleware",
3231
"RequestServiceProviderMiddleware",
33-
"SessionMiddleware",
3432
]

ellar/core/middleware/sessions.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from starlette.middleware.sessions import SessionMiddleware as SessionMiddleware
2+
3+
__all__ = [
4+
"SessionMiddleware",
5+
]

ellar/core/routing/websocket/route.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ def disconnect(self, func: t.Callable[[WebSocket, int], None]) -> t.Callable:
3434
self._handlers_kwargs.update(on_disconnect=func)
3535
return func
3636

37-
def custom_handler(self, name: str) -> t.Callable:
38-
def _wrap(func: t.Callable) -> t.Callable:
39-
self._handlers_kwargs.update({name: func})
40-
return func
41-
42-
return _wrap
43-
4437

4538
class WebsocketRouteOperation(
4639
WebSocketOperationMixin, WebsocketRouteOperationBase, StarletteWebSocketRoute

tests/test_middleware/__init__.py

Whitespace-only changes.

tests/test_routing/test_route_endpoint_params.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
WebSocket as EllarWebSocket,
1414
)
1515
from ellar.core.context import IExecutionContext
16-
from ellar.core.middleware import Middleware, SessionMiddleware
16+
from ellar.core.middleware import Middleware
17+
from ellar.core.middleware.sessions import SessionMiddleware
1718
from ellar.core.routing import ModuleRouter
1819
from ellar.helper.importer import get_class_import
1920

0 commit comments

Comments
 (0)