[cleanup] Bump ruff to 0.15.x (#15951)

Authored by: Grub4K

test/helper.py

@@ -294,7 +294,7 @@ def expect_info_dict(self, got_dict, expected_dict):
 
     missing_keys = sorted(
         test_info_dict.keys() - expected_dict.keys(),
-        key=lambda x: ALLOWED_KEYS_SORT_ORDER.index(x))
+        key=ALLOWED_KEYS_SORT_ORDER.index)
     if missing_keys:
         def _repr(v):
             if isinstance(v, str):

test/test_networking.py

@@ -1004,6 +1004,7 @@ class TestUrllibRequestHandler(TestRequestHandlerBase):
 
 @pytest.mark.parametrize('handler', ['Requests'], indirect=True)
 class TestRequestsRequestHandler(TestRequestHandlerBase):
+    # ruff: disable[PLW0108] `requests` and/or `urllib3` may not be available
     @pytest.mark.parametrize('raised,expected', [
         (lambda: requests.exceptions.ConnectTimeout(), TransportError),
         (lambda: requests.exceptions.ReadTimeout(), TransportError),
@@ -1017,8 +1018,10 @@ class TestRequestsRequestHandler(TestRequestHandlerBase):
         # catch-all: https://github.com/psf/requests/blob/main/src/requests/adapters.py#L535
         (lambda: urllib3.exceptions.HTTPError(), TransportError),
         (lambda: requests.exceptions.RequestException(), RequestError),
-        #  (lambda: requests.exceptions.TooManyRedirects(), HTTPError) - Needs a response object
+        # Needs a response object
+        # (lambda: requests.exceptions.TooManyRedirects(), HTTPError),
     ])
+    # ruff: enable[PLW0108]
     def test_request_error_mapping(self, handler, monkeypatch, raised, expected):
         with handler() as rh:
             def mock_get_instance(*args, **kwargs):
@@ -1034,6 +1037,7 @@ class TestRequestsRequestHandler(TestRequestHandlerBase):
 
             assert exc_info.type is expected
 
+    # ruff: disable[PLW0108] `urllib3` may not be available
     @pytest.mark.parametrize('raised,expected,match', [
         (lambda: urllib3.exceptions.SSLError(), SSLError, None),
         (lambda: urllib3.exceptions.TimeoutError(), TransportError, None),
@@ -1052,6 +1056,7 @@ class TestRequestsRequestHandler(TestRequestHandlerBase):
             '3 bytes read, 5 more expected',
         ),
     ])
+    # ruff: enable[PLW0108]
     def test_response_error_mapping(self, handler, monkeypatch, raised, expected, match):
         from requests.models import Response as RequestsResponse
         from urllib3.response import HTTPResponse as Urllib3Response

test/test_traversal.py

@@ -239,6 +239,7 @@ class TestTraversal:
             'accept matching `expected_type` type'
         assert traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=int) is None, \
             'reject non matching `expected_type` type'
+        # ruff: noqa: PLW0108 `type`s get special treatment, so wrap in lambda
         assert traverse_obj(_EXPECTED_TYPE_DATA, 'int', expected_type=lambda x: str(x)) == '0', \
             'transform type using type function'
         assert traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=lambda _: 1 / 0) is None, \

test/test_websockets.py

@@ -448,6 +448,7 @@ def create_fake_ws_connection(raised):
 
 @pytest.mark.parametrize('handler', ['Websockets'], indirect=True)
 class TestWebsocketsRequestHandler:
+    # ruff: disable[PLW0108] `websockets` may not be available
     @pytest.mark.parametrize('raised,expected', [
         # https://websockets.readthedocs.io/en/stable/reference/exceptions.html
         (lambda: websockets.exceptions.InvalidURI(msg='test', uri='test://'), RequestError),
@@ -459,13 +460,14 @@ class TestWebsocketsRequestHandler:
         (lambda: websockets.exceptions.NegotiationError(), TransportError),
         # Catch-all
         (lambda: websockets.exceptions.WebSocketException(), TransportError),
-        (lambda: TimeoutError(), TransportError),
+        (TimeoutError, TransportError),
         # These may be raised by our create_connection implementation, which should also be caught
-        (lambda: OSError(), TransportError),
-        (lambda: ssl.SSLError(), SSLError),
-        (lambda: ssl.SSLCertVerificationError(), CertificateVerifyError),
-        (lambda: socks.ProxyError(), ProxyError),
+        (OSError, TransportError),
+        (ssl.SSLError, SSLError),
+        (ssl.SSLCertVerificationError, CertificateVerifyError),
+        (socks.ProxyError, ProxyError),
     ])
+    # ruff: enable[PLW0108]
     def test_request_error_mapping(self, handler, monkeypatch, raised, expected):
         import websockets.sync.client
 
@@ -482,11 +484,12 @@ class TestWebsocketsRequestHandler:
     @pytest.mark.parametrize('raised,expected,match', [
         # https://websockets.readthedocs.io/en/stable/reference/sync/client.html#websockets.sync.client.ClientConnection.send
         (lambda: websockets.exceptions.ConnectionClosed(None, None), TransportError, None),
-        (lambda: RuntimeError(), TransportError, None),
-        (lambda: TimeoutError(), TransportError, None),
-        (lambda: TypeError(), RequestError, None),
-        (lambda: socks.ProxyError(), ProxyError, None),
+        (RuntimeError, TransportError, None),
+        (TimeoutError, TransportError, None),
+        (TypeError, RequestError, None),
+        (socks.ProxyError, ProxyError, None),
         # Catch-all
+        # ruff: noqa: PLW0108 `websockets` may not be available
         (lambda: websockets.exceptions.WebSocketException(), TransportError, None),
     ])
     def test_ws_send_error_mapping(self, handler, monkeypatch, raised, expected, match):
@@ -499,10 +502,11 @@ class TestWebsocketsRequestHandler:
     @pytest.mark.parametrize('raised,expected,match', [
         # https://websockets.readthedocs.io/en/stable/reference/sync/client.html#websockets.sync.client.ClientConnection.recv
         (lambda: websockets.exceptions.ConnectionClosed(None, None), TransportError, None),
-        (lambda: RuntimeError(), TransportError, None),
-        (lambda: TimeoutError(), TransportError, None),
-        (lambda: socks.ProxyError(), ProxyError, None),
+        (RuntimeError, TransportError, None),
+        (TimeoutError, TransportError, None),
+        (socks.ProxyError, ProxyError, None),
         # Catch-all
+        # ruff: noqa: PLW0108 `websockets` may not be available
         (lambda: websockets.exceptions.WebSocketException(), TransportError, None),
     ])
     def test_ws_recv_error_mapping(self, handler, monkeypatch, raised, expected, match):