Merge branch 'master' into pathlike

encode · Jul 24, 2020 · c2c4a8b · c2c4a8b
2 parents a9c423c + aee9106
commit c2c4a8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/websockets.md b/docs/websockets.md
@@ -39,7 +39,7 @@ For example: `websocket.headers['sec-websocket-version']`
 
 #### Query Parameters
 
-Headers are exposed as an immutable multi-dict.
+Query parameters are exposed as an immutable multi-dict.
 
 For example: `websocket.query_params['search']`
 

diff --git a/starlette/endpoints.py b/starlette/endpoints.py
@@ -43,7 +43,7 @@ async def method_not_allowed(self, request: Request) -> Response:
 
 class WebSocketEndpoint:
 
-    encoding = None  # May be "text", "bytes", or "json".
+    encoding: typing.Optional[str] = None  # May be "text", "bytes", or "json".
 
     def __init__(self, scope: Scope, receive: Receive, send: Send) -> None:
         assert scope["type"] == "websocket"