chore(ci): enable Ruff rules PLW, PLR, PLC and PLE and fix the errors (aws-powertools#2593)

Co-authored-by: Ruben Fonseca <[email protected]>

Author: 2 people

aws_lambda_powertools/event_handler/api_gateway.py

@@ -843,12 +843,14 @@ def include_router(self, router: "Router", prefix: Optional[str] = None) -> None
         router.context = self.context
 
         for route, func in router._routes.items():
+            new_route = route
+
             if prefix:
                 rule = route[0]
                 rule = prefix if rule == "/" else f"{prefix}{rule}"
-                route = (rule, *route[1:])
+                new_route = (rule, *route[1:])
 
-            self.route(*route)(func)
+            self.route(*new_route)(func)
 
 
 class Router(BaseRouter):

aws_lambda_powertools/metrics/metrics.py

@@ -76,7 +76,7 @@ def __init__(self, service: Optional[str] = None, namespace: Optional[str] = Non
         self.dimension_set = self._dimensions
 
         self.dimension_set.update(**self._default_dimensions)
-        return super().__init__(
+        super().__init__(
             namespace=namespace,
             service=service,
             metric_set=self.metric_set,

examples/parameters/tests/test_clear_cache_global.py

@@ -1,5 +1,6 @@
 import pytest
-import src.app as app
+
+from src import app
 
 from aws_lambda_powertools.utilities import parameters
 

examples/parameters/tests/test_clear_cache_method.py

@@ -1,5 +1,6 @@
 import pytest
-import src.app as app
+
+from src import app
 
 
 @pytest.fixture(scope="function", autouse=True)

examples/parameters/tests/test_single_mock.py

@@ -1,4 +1,4 @@
-import src.single_mock as single_mock
+from src import single_mock
 
 
 def test_handler(monkeypatch):

examples/parameters/tests/test_with_fixture.py

@@ -1,5 +1,6 @@
 import pytest
-import src.single_mock as single_mock
+
+from src import single_mock
 
 
 @pytest.fixture

examples/parameters/tests/test_with_monkeypatch.py

@@ -1,6 +1,6 @@
 from unittest.mock import patch
 
-import src.single_mock as single_mock
+from src import single_mock
 
 
 # Replaces "aws_lambda_powertools.utilities.parameters.get_parameter" with a Mock object

ruff.toml

@@ -37,10 +37,6 @@ ignore = [
     "B018", # useless-expression - disabled temporarily
     "COM812", # Trailing comma missing - disabled temporarily
     "PLC1901", # Compare-to-empty-string - disabled temporarily
-    "PLW", # Warning category - disabled temporarily
-    "PLR", # Refactoring category - disabled temporarily
-    "PLC", # Convention category - disabled temporarily
-    "PLE", # Error category - disabled temporarily
     "ISC", # flake8-implicit-str-concat - disabled temporarily
     "I001", # isort - disabled temporarily
     ]

tests/e2e/event_handler/test_header_serializer.py

@@ -67,8 +67,8 @@ def test_alb_headers_serializer(alb_basic_listener_endpoint):
     # Only the last header should be set
     for key, value in headers.items():
         assert key in response.headers
-        value = value if isinstance(value, str) else sorted(value)[-1]
-        assert response.headers[key] == value
+        new_value = value if isinstance(value, str) else sorted(value)[-1]
+        assert response.headers[key] == new_value
 
     # Only the last cookie should be set
     assert len(response.cookies.items()) == 1
@@ -104,11 +104,11 @@ def test_alb_multi_value_headers_serializer(alb_multi_value_header_listener_endp
 
     for key, value in headers.items():
         assert key in response.headers
-        value = value if isinstance(value, str) else ", ".join(sorted(value))
+        new_value = value if isinstance(value, str) else ", ".join(sorted(value))
 
         # ALB sorts the header values randomly, so we have to re-order them for comparison here
         returned_value = ", ".join(sorted(response.headers[key].split(", ")))
-        assert returned_value == value
+        assert returned_value == new_value
 
     for cookie in cookies:
         assert cookie.name in response.cookies
@@ -143,8 +143,8 @@ def test_api_gateway_rest_headers_serializer(apigw_rest_endpoint):
 
     for key, value in headers.items():
         assert key in response.headers
-        value = value if isinstance(value, str) else ", ".join(sorted(value))
-        assert response.headers[key] == value
+        new_value = value if isinstance(value, str) else ", ".join(sorted(value))
+        assert response.headers[key] == new_value
 
     for cookie in cookies:
         assert cookie.name in response.cookies
@@ -180,8 +180,8 @@ def test_api_gateway_http_headers_serializer(apigw_http_endpoint):
 
     for key, value in headers.items():
         assert key in response.headers
-        value = value if isinstance(value, str) else ", ".join(sorted(value))
-        assert response.headers[key] == value
+        new_value = value if isinstance(value, str) else ", ".join(sorted(value))
+        assert response.headers[key] == new_value
 
     for cookie in cookies:
         assert cookie.name in response.cookies
@@ -217,8 +217,8 @@ def test_lambda_function_url_headers_serializer(lambda_function_url_endpoint):
 
     for key, value in headers.items():
         assert key in response.headers
-        value = value if isinstance(value, str) else ", ".join(sorted(value))
-        assert response.headers[key] == value
+        new_value = value if isinstance(value, str) else ", ".join(sorted(value))
+        assert response.headers[key] == new_value
 
     for cookie in cookies:
         assert cookie.name in response.cookies

tests/e2e/utils/data_fetcher/common.py

@@ -2,7 +2,7 @@
 from typing import Optional, Tuple
 
 import boto3
-import requests as requests
+import requests
 from mypy_boto3_lambda import LambdaClient
 from mypy_boto3_lambda.type_defs import InvocationResponseTypeDef
 from requests import Request, Response