fix(scope): Revert scope state regression (#3075)

Revert scope state regression
litestar-org · Feb 6, 2024 · 9fad4b5 · 9fad4b5
1 parent 04dd5b5
commit 9fad4b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/litestar/utils/scope/state.py b/litestar/utils/scope/state.py
@@ -96,9 +96,9 @@ def from_scope(cls, scope: Scope) -> Self:
         Returns:
             A `ConnectionState` object.
         """
-        base = scope["state"] if "state" in scope else scope
-        if (state := base.get(CONNECTION_STATE_KEY)) is None:
-            state = base[CONNECTION_STATE_KEY] = cls()
+        base_scope_state = scope.setdefault("state", {})
+        if (state := base_scope_state.get(CONNECTION_STATE_KEY)) is None:
+            state = base_scope_state[CONNECTION_STATE_KEY] = cls()
         return state
 
 

diff --git a/tests/unit/test_utils/test_scope.py b/tests/unit/test_utils/test_scope.py
@@ -24,8 +24,7 @@ def scope(create_scope: Callable[..., Scope]) -> Scope:
 def test_from_scope_without_state() -> None:
     scope = {}  # type: ignore[var-annotated]
     state = ScopeState.from_scope(scope)  # type: ignore[arg-type]
-    assert "state" not in scope
-    assert scope[CONNECTION_STATE_KEY] is state
+    assert scope["state"][CONNECTION_STATE_KEY] is state
 
 
 @pytest.mark.parametrize(("pop",), [(True,), (False,)])