drop prospector in favour of flake8+black

due to unfixed dependency issues upstream: prospector-dev/prospector#413

Author: Kriechi

setup.cfg

@@ -16,6 +16,11 @@ source =
     src
     .tox/*/site-packages
 
+[flake8]
+max-line-length = 120
+max-complexity = 15
+ignore = E203,W503,W504
+
 [isort]
 combine_as_imports=True
 force_grid_wrap=0

src/wsproto/handshake.py

@@ -176,7 +176,7 @@ def events(self) -> Generator[Event, None, None]:
         while self._events:
             yield self._events.popleft()
 
-    ############ Server mode methods
+    # Server mode methods
 
     def _process_connection_request(  # noqa: MC0001
         self, event: h11.Request
@@ -317,7 +317,7 @@ def _send_reject_data(self, event: RejectData) -> bytes:
             self._state = ConnectionState.CLOSED
         return data
 
-    ############ Client mode methods
+    # Client mode methods
 
     def _initiate_connection(self, request: Request) -> bytes:
         self._initiating_request = request

test/test_client.py

@@ -130,7 +130,7 @@ def test_connection_send_state() -> None:
     assert len(list(client.events())) == 1
     assert client.state is ConnectionState.OPEN  # type: ignore # https://github.com/python/mypy/issues/9005
 
-    with pytest.raises(LocalProtocolError) as excinfo:
+    with pytest.raises(LocalProtocolError):
         client.send(Request(host="localhost", target="/"))
 
     client.receive_data(b"foobar")
@@ -202,20 +202,20 @@ def test_handshake_extra_accept_headers() -> None:
 @pytest.mark.parametrize("extra_headers", [[], [(b"connection", b"Keep-Alive")]])
 def test_handshake_response_broken_connection_header(extra_headers: Headers) -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        events = _make_handshake(101, [(b"upgrade", b"WebSocket")] + extra_headers)
+        _make_handshake(101, [(b"upgrade", b"WebSocket")] + extra_headers)
     assert str(excinfo.value) == "Missing header, 'Connection: Upgrade'"
 
 
 @pytest.mark.parametrize("extra_headers", [[], [(b"upgrade", b"h2")]])
 def test_handshake_response_broken_upgrade_header(extra_headers: Headers) -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        events = _make_handshake(101, [(b"connection", b"Upgrade")] + extra_headers)
+        _make_handshake(101, [(b"connection", b"Upgrade")] + extra_headers)
     assert str(excinfo.value) == "Missing header, 'Upgrade: WebSocket'"
 
 
 def test_handshake_response_missing_websocket_key_header() -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        events = _make_handshake(
+        _make_handshake(
             101,
             [(b"connection", b"Upgrade"), (b"upgrade", b"WebSocket")],
             auto_accept_key=False,
@@ -238,7 +238,7 @@ def test_handshake_with_subprotocol() -> None:
 
 def test_handshake_bad_subprotocol() -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        events = _make_handshake(
+        _make_handshake(
             101,
             [
                 (b"connection", b"Upgrade"),
@@ -265,7 +265,7 @@ def test_handshake_with_extension() -> None:
 
 def test_handshake_bad_extension() -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        events = _make_handshake(
+        _make_handshake(
             101,
             [
                 (b"connection", b"Upgrade"),

test/test_handshake.py

@@ -1,7 +1,7 @@
 import pytest
 
 from wsproto.connection import CLIENT, ConnectionState, SERVER
-from wsproto.events import AcceptConnection, Ping, RejectConnection, Request
+from wsproto.events import AcceptConnection, Ping, Request
 from wsproto.handshake import H11Handshake
 from wsproto.utilities import LocalProtocolError, RemoteProtocolError
 

test/test_permessage_deflate.py

@@ -304,7 +304,7 @@ def test_client_decompress_after_uncompressible_frame(self, client: bool) -> Non
         proto = fp.FrameProtocol(client=client, extensions=[ext])
 
         # A PING frame
-        result = ext.frame_inbound_header(
+        ext.frame_inbound_header(
             proto, fp.Opcode.PING, fp.RsvBits(False, False, False), 0
         )
         result2 = ext.frame_inbound_payload_data(proto, b"")

test/test_server.py

@@ -62,7 +62,7 @@ def test_connection_request() -> None:
 
 def test_connection_request_bad_method() -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        event = _make_connection_request(
+        _make_connection_request(
             [
                 (b"Host", b"localhost"),
                 (b"Connection", b"Keep-Alive, Upgrade"),
@@ -77,7 +77,7 @@ def test_connection_request_bad_method() -> None:
 
 def test_connection_request_bad_connection_header() -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        event = _make_connection_request(
+        _make_connection_request(
             [
                 (b"Host", b"localhost"),
                 (b"Connection", b"Keep-Alive, No-Upgrade"),
@@ -91,7 +91,7 @@ def test_connection_request_bad_connection_header() -> None:
 
 def test_connection_request_bad_upgrade_header() -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        event = _make_connection_request(
+        _make_connection_request(
             [
                 (b"Host", b"localhost"),
                 (b"Connection", b"Keep-Alive, Upgrade"),
@@ -106,7 +106,7 @@ def test_connection_request_bad_upgrade_header() -> None:
 @pytest.mark.parametrize("version", [b"12", b"not-a-digit"])
 def test_connection_request_bad_version_header(version: bytes) -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        event = _make_connection_request(
+        _make_connection_request(
             [
                 (b"Host", b"localhost"),
                 (b"Connection", b"Keep-Alive, Upgrade"),
@@ -123,7 +123,7 @@ def test_connection_request_bad_version_header(version: bytes) -> None:
 
 def test_connection_request_key_header() -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
-        event = _make_connection_request(
+        _make_connection_request(
             [
                 (b"Host", b"localhost"),
                 (b"Connection", b"Keep-Alive, Upgrade"),

tox.ini

@@ -25,13 +25,13 @@ commands = pytest {posargs}
 
 [testenv:lint]
 deps =
-    prospector==1.3.1
+    flake8>=3.9.1,<4
     black==20.8b1
     isort==5.6.4
     mypy==0.790
     pytest==6.1.2
 commands =
-    prospector
+    flake8 src/ test/
     black --check --diff src/ test/ example/ compliance/ bench/
     isort --check --diff src/ test/ example/ compliance/ bench/
     mypy src/ test/ example/ bench/