Fix mypy issues with the latest mypy

This also clarifies some of the typing (i.e. Iterable being required
rather than the more specific List).

Author: pgjones

example/synchronous_client.py

@@ -71,7 +71,7 @@ def wsproto_demo(host: str, port: int) -> None:
 
     # 3) Send ping and display pong
     payload = b"table tennis"
-    print("Sending ping: {}".format(payload))
+    print("Sending ping: {!r}".format(payload))
     net_send(ws.send(Ping(payload=payload)), conn)
     net_recv(ws, conn)
     handle_events(ws)
@@ -113,7 +113,7 @@ def handle_events(ws: WSConnection) -> None:
         elif isinstance(event, TextMessage):
             print("Received message: {}".format(event.data))
         elif isinstance(event, Pong):
-            print("Received pong: {}".format(event.payload))
+            print("Received pong: {!r}".format(event.payload))
         else:
             raise Exception("Do not know how to handle event: " + str(event))
 

test/test_connection.py

@@ -71,7 +71,7 @@ def test_closure(client_sends: bool, code: CloseReason, reason: str) -> None:
     assert event.code is code
     assert event.reason == reason
 
-    assert remote.state is ConnectionState.CLOSED
+    assert remote.state is ConnectionState.CLOSED  # type: ignore
     assert local.state is ConnectionState.CLOSED
 
 

wsproto/handshake.py

@@ -6,7 +6,17 @@
 An implementation of WebSocket handshakes.
 """
 from collections import deque
-from typing import Deque, Dict, Generator, List, Optional, Union
+from typing import (
+    cast,
+    Deque,
+    Dict,
+    Generator,
+    Iterable,
+    List,
+    Optional,
+    Sequence,
+    Union,
+)
 
 import h11
 
@@ -268,8 +278,9 @@ def _accept(self, event: AcceptConnection) -> bytes:
             )
 
         if event.extensions:
-            accepts = server_extensions_handshake(  # type: ignore
-                self._initiating_request.extensions, event.extensions
+            accepts = server_extensions_handshake(
+                cast(Sequence[str], self._initiating_request.extensions),
+                event.extensions,
             )
             if accepts:
                 headers.append((b"Sec-WebSocket-Extensions", accepts))
@@ -407,8 +418,8 @@ def _establish_client_connection(
                     "unrecognized subprotocol {}".format(subprotocol),
                     event_hint=RejectConnection(),
                 )
-        extensions = client_extensions_handshake(  # type: ignore
-            accepts, self._initiating_request.extensions
+        extensions = client_extensions_handshake(
+            accepts, cast(Sequence[Extension], self._initiating_request.extensions)
         )
 
         self._connection = Connection(
@@ -428,7 +439,7 @@ def __repr__(self) -> str:
 
 
 def server_extensions_handshake(
-    requested: List[str], supported: List[Extension]
+    requested: Iterable[str], supported: List[Extension]
 ) -> Optional[bytes]:
     """Agree on the extensions to use returning an appropriate header value.
 
@@ -464,7 +475,7 @@ def server_extensions_handshake(
 
 
 def client_extensions_handshake(
-    accepted: List[str], supported: List[Extension]
+    accepted: Iterable[str], supported: Sequence[Extension]
 ) -> List[Extension]:
     # This raises RemoteProtocolError is the accepted extension is not
     # supported.