Remove some type: ignores and fix the problems

Author: bluetech

test/test_client.py

@@ -63,7 +63,7 @@ def test_connection_request_additional_headers() -> None:
 def test_connection_request_simple_extension() -> None:
     extension = FakeExtension(offer_response=True)
     request = _make_connection_request(
-        Request(host="localhost", target="/", extensions=[extension])  # type: ignore
+        Request(host="localhost", target="/", extensions=[extension])
     )
 
     headers = normed_header_dict(request.headers)
@@ -73,23 +73,24 @@ def test_connection_request_simple_extension() -> None:
 def test_connection_request_simple_extension_no_offer() -> None:
     extension = FakeExtension(offer_response=False)
     request = _make_connection_request(
-        Request(host="localhost", target="/", extensions=[extension])  # type: ignore
+        Request(host="localhost", target="/", extensions=[extension])
     )
 
     headers = normed_header_dict(request.headers)
     assert b"sec-websocket-extensions" not in headers
 
 
 def test_connection_request_parametrised_extension() -> None:
-    extension = FakeExtension(offer_response="parameter1=value1; parameter2=value2")
+    offer_response = "parameter1=value1; parameter2=value2"
+    extension = FakeExtension(offer_response=offer_response)
     request = _make_connection_request(
-        Request(host="localhost", target="/", extensions=[extension])  # type: ignore
+        Request(host="localhost", target="/", extensions=[extension])
     )
 
     headers = normed_header_dict(request.headers)
     assert headers[b"sec-websocket-extensions"] == b"%s; %s" % (
         extension.name.encode("ascii"),
-        extension.offer_response.encode("ascii"),  # type: ignore
+        offer_response.encode("ascii"),
     )
 
 

test/test_connection.py

@@ -33,9 +33,7 @@ def test_send_message(client_sends: bool, final: bool) -> None:
         remote = client
 
     data = b"x" * 23
-    remote.receive_data(
-        local.send(BytesMessage(data=data, message_finished=final))  # type: ignore
-    )
+    remote.receive_data(local.send(BytesMessage(data=data, message_finished=final)))
     event = next(remote.events())
     assert isinstance(event, BytesMessage)
     assert event.data == data
@@ -135,9 +133,7 @@ def test_data(split_message: bool) -> None:
 
     data = "ƒñö®∂😎"
     server.receive_data(
-        client.send(
-            TextMessage(data=data, message_finished=not split_message)  # type: ignore
-        )
+        client.send(TextMessage(data=data, message_finished=not split_message))
     )
     event = next(server.events())
     assert isinstance(event, TextMessage)

test/test_frame_protocol.py

@@ -4,7 +4,7 @@
 import struct
 from binascii import unhexlify
 from codecs import getincrementaldecoder
-from typing import Optional, Tuple, Union
+from typing import Dict, Optional, Tuple, Union
 
 import pytest
 
@@ -98,7 +98,6 @@ def test_follow_on_binary_frame(self) -> None:
         payload = b"x" * 23
         decoder = fp.MessageDecoder()
         decoder.opcode = fp.Opcode.BINARY
-        decoder.seen_first_frame = True  # type: ignore
         frame = fp.Frame(
             opcode=fp.Opcode.CONTINUATION,
             payload=payload,
@@ -132,7 +131,6 @@ def test_follow_on_text_frame(self) -> None:
         binary_payload = text_payload.encode("utf8")
         decoder = fp.MessageDecoder()
         decoder.opcode = fp.Opcode.TEXT
-        decoder.seen_first_frame = True  # type: ignore
         decoder.decoder = getincrementaldecoder("utf-8")()
 
         assert decoder.decoder.decode(binary_payload[:4]) == text_payload[:2]
@@ -156,7 +154,6 @@ def test_final_text_frame(self) -> None:
         binary_payload = text_payload.encode("utf8")
         decoder = fp.MessageDecoder()
         decoder.opcode = fp.Opcode.TEXT
-        decoder.seen_first_frame = True  # type: ignore
         decoder.decoder = getincrementaldecoder("utf-8")()
 
         assert decoder.decoder.decode(binary_payload[:-2]) == text_payload[:-1]
@@ -192,7 +189,6 @@ def test_missing_continuation_1(self) -> None:
         payload = b"x" * 23
         decoder = fp.MessageDecoder()
         decoder.opcode = fp.Opcode.BINARY
-        decoder.seen_first_frame = True  # type: ignore
         frame = fp.Frame(
             opcode=fp.Opcode.BINARY,
             payload=payload,
@@ -887,21 +883,21 @@ def test_outbound_handling_single_frame(self) -> None:
         proto = fp.FrameProtocol(client=False, extensions=[ext])
         payload = "😃😄🙃😉"
         data = proto.send_data(payload, fin=True)
-        payload = (payload + "®").encode("utf8")  # type: ignore
-        assert data == b"\x91" + bytearray([len(payload)]) + payload  # type: ignore
+        payload_bytes = (payload + "®").encode("utf8")
+        assert data == b"\x91" + bytearray([len(payload_bytes)]) + payload_bytes
 
     def test_outbound_handling_multiple_frames(self) -> None:
         ext = self.FakeExtension()
         proto = fp.FrameProtocol(client=False, extensions=[ext])
         payload = "😃😄🙃😉"
         data = proto.send_data(payload, fin=False)
-        payload = payload.encode("utf8")  # type: ignore
-        assert data == b"\x11" + bytearray([len(payload)]) + payload  # type: ignore
+        payload_bytes = payload.encode("utf8")
+        assert data == b"\x11" + bytearray([len(payload_bytes)]) + payload_bytes
 
         payload = r"¯\_(ツ)_/¯"
         data = proto.send_data(payload, fin=True)
-        payload = (payload + "®").encode("utf8")  # type: ignore
-        assert data == b"\x80" + bytearray([len(payload)]) + payload  # type: ignore
+        payload_bytes = (payload + "®").encode("utf8")
+        assert data == b"\x80" + bytearray([len(payload_bytes)]) + payload_bytes
 
 
 class TestFrameProtocolReceive:
@@ -1077,8 +1073,8 @@ def test_single_short_text_data(self) -> None:
         proto = fp.FrameProtocol(client=False, extensions=[])
         payload = "😃😄🙃😉"
         data = proto.send_data(payload, fin=True)
-        payload = payload.encode("utf8")  # type: ignore
-        assert data == b"\x81" + bytearray([len(payload)]) + payload  # type: ignore
+        payload_bytes = payload.encode("utf8")
+        assert data == b"\x81" + bytearray([len(payload_bytes)]) + payload_bytes
 
     def test_multiple_short_binary_data(self) -> None:
         proto = fp.FrameProtocol(client=False, extensions=[])
@@ -1094,34 +1090,34 @@ def test_multiple_short_text_data(self) -> None:
         proto = fp.FrameProtocol(client=False, extensions=[])
         payload = "😃😄🙃😉"
         data = proto.send_data(payload, fin=False)
-        payload = payload.encode("utf8")  # type: ignore
-        assert data == b"\x01" + bytearray([len(payload)]) + payload  # type: ignore
+        payload_bytes = payload.encode("utf8")
+        assert data == b"\x01" + bytearray([len(payload_bytes)]) + payload_bytes
 
         payload = "🙈🙉🙊"
         data = proto.send_data(payload, fin=True)
-        payload = payload.encode("utf8")  # type: ignore
-        assert data == b"\x80" + bytearray([len(payload)]) + payload  # type: ignore
+        payload_bytes = payload.encode("utf8")
+        assert data == b"\x80" + bytearray([len(payload_bytes)]) + payload_bytes
 
     def test_mismatched_data_messages1(self) -> None:
         proto = fp.FrameProtocol(client=False, extensions=[])
         payload = "😃😄🙃😉"
         data = proto.send_data(payload, fin=False)
-        payload = payload.encode("utf8")  # type: ignore
-        assert data == b"\x01" + bytearray([len(payload)]) + payload  # type: ignore
+        payload_bytes = payload.encode("utf8")
+        assert data == b"\x01" + bytearray([len(payload_bytes)]) + payload_bytes
 
-        payload = b"seriously, all ascii"  # type: ignore
+        payload_bytes = b"seriously, all ascii"
         with pytest.raises(TypeError):
-            proto.send_data(payload)
+            proto.send_data(payload_bytes)
 
     def test_mismatched_data_messages2(self) -> None:
         proto = fp.FrameProtocol(client=False, extensions=[])
         payload = b"it's all just ascii, right?"
         data = proto.send_data(payload, fin=False)
         assert data == b"\x02" + bytearray([len(payload)]) + payload
 
-        payload = "✔️☑️✅✔︎☑"  # type: ignore
+        payload_str = "✔️☑️✅✔︎☑"
         with pytest.raises(TypeError):
-            proto.send_data(payload)
+            proto.send_data(payload_str)
 
     def test_message_length_max_short(self) -> None:
         proto = fp.FrameProtocol(client=False, extensions=[])
@@ -1188,7 +1184,8 @@ def test_control_frame_with_overly_long_payload(self) -> None:
 
     def test_data_we_have_no_idea_what_to_do_with(self) -> None:
         proto = fp.FrameProtocol(client=False, extensions=[])
-        payload = dict()  # type: ignore
+        payload: Dict[str, str] = dict()
 
         with pytest.raises(ValueError):
+            # Intentionally passing illegal type.
             proto.send_data(payload)  # type: ignore

test/test_server.py

@@ -32,7 +32,9 @@ def _make_connection_request(request_headers: Headers, method: str = "GET") -> R
     server.receive_data(
         client.send(h11.Request(method=method, target="/", headers=request_headers))
     )
-    return next(server.events())  # type: ignore
+    event = next(server.events())
+    assert isinstance(event, Request)
+    return event
 
 
 def test_connection_request() -> None:

wsproto/connection.py

@@ -8,7 +8,7 @@
 
 from collections import deque
 from enum import Enum
-from typing import Generator, List, Optional
+from typing import Deque, Generator, List, Optional
 
 from .events import (
     BytesMessage,
@@ -78,7 +78,7 @@ def __init__(
         trailing_data: bytes = b"",
     ) -> None:
         self.client = connection_type is ConnectionType.CLIENT
-        self._events = deque()  # type: ignore
+        self._events: Deque[Event] = deque()
         self._proto = FrameProtocol(self.client, extensions or [])
         self._state = ConnectionState.OPEN
         self.receive_data(trailing_data)
@@ -148,29 +148,34 @@ def events(self) -> Generator[Event, None, None]:
             for frame in self._proto.received_frames():
                 if frame.opcode is Opcode.PING:
                     assert frame.frame_finished and frame.message_finished
-                    yield Ping(payload=frame.payload)  # type: ignore
+                    assert isinstance(frame.payload, (bytes, bytearray))
+                    yield Ping(payload=frame.payload)
 
                 elif frame.opcode is Opcode.PONG:
                     assert frame.frame_finished and frame.message_finished
-                    yield Pong(payload=frame.payload)  # type: ignore
+                    assert isinstance(frame.payload, (bytes, bytearray))
+                    yield Pong(payload=frame.payload)
 
                 elif frame.opcode is Opcode.CLOSE:
+                    assert isinstance(frame.payload, tuple)
                     code, reason = frame.payload
                     if self.state is ConnectionState.LOCAL_CLOSING:
                         self._state = ConnectionState.CLOSED
                     else:
                         self._state = ConnectionState.REMOTE_CLOSING
-                    yield CloseConnection(code=code, reason=reason)  # type: ignore
+                    yield CloseConnection(code=code, reason=reason)
 
                 elif frame.opcode is Opcode.TEXT:
-                    yield TextMessage(  # type: ignore
+                    assert isinstance(frame.payload, str)
+                    yield TextMessage(
                         data=frame.payload,
                         frame_finished=frame.frame_finished,
                         message_finished=frame.message_finished,
                     )
 
                 elif frame.opcode is Opcode.BINARY:
-                    yield BytesMessage(  # type: ignore
+                    assert isinstance(frame.payload, (bytes, bytearray))
+                    yield BytesMessage(
                         data=frame.payload,
                         frame_finished=frame.frame_finished,
                         message_finished=frame.message_finished,

wsproto/events.py

@@ -7,7 +7,7 @@
 """
 from abc import ABC
 from dataclasses import dataclass, field
-from typing import Generic, List, Optional, TypeVar, Union
+from typing import Generic, List, Optional, Sequence, TypeVar, Union
 
 from .extensions import Extension
 from .typing import Headers
@@ -55,7 +55,7 @@ class Request(Event):
 
     host: str
     target: str
-    extensions: Union[List[Extension], List[str]] = field(  # type: ignore
+    extensions: Union[Sequence[Extension], Sequence[str]] = field(  # type: ignore
         default_factory=list
     )
     extra_headers: Headers = field(default_factory=list)
@@ -235,7 +235,8 @@ class TextMessage(Message[str]):
 
     """
 
-    pass
+    # https://github.com/python/mypy/issues/5744
+    data: str
 
 
 @dataclass(frozen=True)
@@ -253,7 +254,8 @@ class BytesMessage(Message[bytes]):
        reassemble these chunks to get the full message.
     """
 
-    pass
+    # https://github.com/python/mypy/issues/5744
+    data: bytes
 
 
 @dataclass(frozen=True)