Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid TypeError on websocket.disconnect when code is None #1574

Merged
merged 2 commits into from Apr 6, 2022
Merged

Avoid TypeError on websocket.disconnect when code is None #1574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c27f8ad
Default to 1000 in case of `code` being `None` on `websocket.disconnect`
Kludex Apr 5, 2022
4dc4f10
Merge branch 'master' into fix/close-code-websocket-endpoint
abersheeran Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion starlette/endpoints.py
View file
Open in desktop
Expand Up @@ -80,7 +80,9 @@ async def dispatch(self) -> None:
data = await self.decode(websocket, message)
await self.on_receive(websocket, data)
elif message["type"] == "websocket.disconnect":
close_code = int(message.get("code", status.WS_1000_NORMAL_CLOSURE))
close_code = int(
message.get("code") or status.WS_1000_NORMAL_CLOSURE
)
break
except Exception as exc:
close_code = status.WS_1011_INTERNAL_ERROR
Expand Down