From 4aa91dc90ccd743209b02e308e498ce0f57616f6 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 19 Feb 2023 17:19:50 +0100 Subject: [PATCH] Upgrade to black 2023 style. Changes stem from https://github.com/psf/black/pull/3035. --- src/websockets/client.py | 4 ---- src/websockets/extensions/permessage_deflate.py | 1 - src/websockets/legacy/client.py | 4 ---- src/websockets/legacy/framing.py | 1 - src/websockets/legacy/protocol.py | 2 -- src/websockets/legacy/server.py | 5 ----- src/websockets/server.py | 3 --- tests/legacy/test_auth.py | 1 - tests/legacy/test_client_server.py | 4 ---- 9 files changed, 25 deletions(-) diff --git a/src/websockets/client.py b/src/websockets/client.py index df4f067d..b5f87157 100644 --- a/src/websockets/client.py +++ b/src/websockets/client.py @@ -222,7 +222,6 @@ def process_extensions(self, headers: Headers) -> List[Extension]: extensions = headers.get_all("Sec-WebSocket-Extensions") if extensions: - if self.available_extensions is None: raise InvalidHandshake("no extensions supported") @@ -231,9 +230,7 @@ def process_extensions(self, headers: Headers) -> List[Extension]: ) for name, response_params in parsed_extensions: - for extension_factory in self.available_extensions: - # Skip non-matching extensions based on their name. if extension_factory.name != name: continue @@ -280,7 +277,6 @@ def process_subprotocol(self, headers: Headers) -> Optional[Subprotocol]: subprotocols = headers.get_all("Sec-WebSocket-Protocol") if subprotocols: - if self.available_subprotocols is None: raise InvalidHandshake("no subprotocols supported") diff --git a/src/websockets/extensions/permessage_deflate.py b/src/websockets/extensions/permessage_deflate.py index e0de5e8f..b391837c 100644 --- a/src/websockets/extensions/permessage_deflate.py +++ b/src/websockets/extensions/permessage_deflate.py @@ -211,7 +211,6 @@ def _extract_parameters( client_max_window_bits: Optional[Union[int, bool]] = None for name, value in params: - if name == "server_no_context_takeover": if server_no_context_takeover: raise exceptions.DuplicateParameter(name) diff --git a/src/websockets/legacy/client.py b/src/websockets/legacy/client.py index 1e59a56c..f8876f59 100644 --- a/src/websockets/legacy/client.py +++ b/src/websockets/legacy/client.py @@ -188,7 +188,6 @@ def process_extensions( header_values = headers.get_all("Sec-WebSocket-Extensions") if header_values: - if available_extensions is None: raise InvalidHandshake("no extensions supported") @@ -197,9 +196,7 @@ def process_extensions( ) for name, response_params in parsed_header_values: - for extension_factory in available_extensions: - # Skip non-matching extensions based on their name. if extension_factory.name != name: continue @@ -245,7 +242,6 @@ def process_subprotocol( header_values = headers.get_all("Sec-WebSocket-Protocol") if header_values: - if available_subprotocols is None: raise InvalidHandshake("no subprotocols supported") diff --git a/src/websockets/legacy/framing.py b/src/websockets/legacy/framing.py index 04cddc0e..29864b13 100644 --- a/src/websockets/legacy/framing.py +++ b/src/websockets/legacy/framing.py @@ -14,7 +14,6 @@ class Frame(NamedTuple): - fin: bool opcode: frames.Opcode data: bytes diff --git a/src/websockets/legacy/protocol.py b/src/websockets/legacy/protocol.py index 374aa476..d31ec19a 100644 --- a/src/websockets/legacy/protocol.py +++ b/src/websockets/legacy/protocol.py @@ -652,7 +652,6 @@ async def send( # Fragmented message -- regular iterator. elif isinstance(message, Iterable): - # Work around https://github.com/python/mypy/issues/6227 message = cast(Iterable[Data], message) @@ -1519,7 +1518,6 @@ def connection_lost(self, exc: Optional[Exception]) -> None: self.connection_lost_waiter.set_result(None) if True: # pragma: no cover - # Copied from asyncio.StreamReaderProtocol if self.reader is not None: if exc is None: diff --git a/src/websockets/legacy/server.py b/src/websockets/legacy/server.py index 72f0a820..048a270b 100644 --- a/src/websockets/legacy/server.py +++ b/src/websockets/legacy/server.py @@ -160,7 +160,6 @@ async def handler(self) -> None: """ try: - try: await self.handshake( origins=self.origins, @@ -443,15 +442,12 @@ def process_extensions( header_values = headers.get_all("Sec-WebSocket-Extensions") if header_values and available_extensions: - parsed_header_values: List[ExtensionHeader] = sum( [parse_extension(header_value) for header_value in header_values], [] ) for name, request_params in parsed_header_values: - for ext_factory in available_extensions: - # Skip non-matching extensions based on their name. if ext_factory.name != name: continue @@ -503,7 +499,6 @@ def process_subprotocol( header_values = headers.get_all("Sec-WebSocket-Protocol") if header_values and available_subprotocols: - parsed_header_values: List[Subprotocol] = sum( [parse_subprotocol(header_value) for header_value in header_values], [] ) diff --git a/src/websockets/server.py b/src/websockets/server.py index 9415a99a..16979e7e 100644 --- a/src/websockets/server.py +++ b/src/websockets/server.py @@ -354,15 +354,12 @@ def process_extensions( header_values = headers.get_all("Sec-WebSocket-Extensions") if header_values and self.available_extensions: - parsed_header_values: List[ExtensionHeader] = sum( [parse_extension(header_value) for header_value in header_values], [] ) for name, request_params in parsed_header_values: - for ext_factory in self.available_extensions: - # Skip non-matching extensions based on their name. if ext_factory.name != name: continue diff --git a/tests/legacy/test_auth.py b/tests/legacy/test_auth.py index 2b670c31..3754bcf3 100644 --- a/tests/legacy/test_auth.py +++ b/tests/legacy/test_auth.py @@ -32,7 +32,6 @@ async def check_credentials(self, username, password): class AuthClientServerTests(ClientServerTestsMixin, AsyncioTestCase): - create_protocol = basic_auth_protocol_factory( realm="auth-tests", credentials=("hello", "iloveyou") ) diff --git a/tests/legacy/test_client_server.py b/tests/legacy/test_client_server.py index 4a451053..b05d4072 100644 --- a/tests/legacy/test_client_server.py +++ b/tests/legacy/test_client_server.py @@ -212,7 +212,6 @@ class BarClientProtocol(WebSocketClientProtocol): class ClientServerTestsMixin: - secure = False def setUp(self): @@ -309,7 +308,6 @@ def make_http_request(self, path="/", headers=None): class SecureClientServerTestsMixin(ClientServerTestsMixin): - secure = True @property @@ -1299,7 +1297,6 @@ class ClientServerTests( class SecureClientServerTests( CommonClientServerTests, SecureClientServerTestsMixin, AsyncioTestCase ): - # The implementation of this test makes it hard to run it over TLS. test_client_connect_canceled_during_handshake = None @@ -1462,7 +1459,6 @@ async def run_server(path): class AsyncIteratorTests(ClientServerTestsMixin, AsyncioTestCase): - # This is a protocol-level feature, but since it's a high-level API, it is # much easier to exercise at the client or server level.