Merge pull request road-core#302 from tisnik/dont-redeclare-outer-scope-var-by-local-one

Dont redeclare outer scope var by local one

Author: tisnik

ols/app/endpoints/feedback.py

@@ -84,8 +84,10 @@ def feedback_status() -> StatusResponse:
         Response indicating the status of the feedback.
     """
     logger.debug("feedback status request received")
-    feedback_status = is_feedback_enabled()
-    return StatusResponse(functionality="feedback", status={"enabled": feedback_status})
+    feedback_status_enabled = is_feedback_enabled()
+    return StatusResponse(
+        functionality="feedback", status={"enabled": feedback_status_enabled}
+    )
 
 
 post_feedback_responses: dict[int | str, dict[str, Any]] = {

ols/utils/tls.py

@@ -113,10 +113,10 @@ def min_tls_version(
     tls_profile: TLSProfiles,
 ) -> Optional[ssl.TLSVersion]:
     """Retrieve minimal TLS version for the profile or for the current profile configuration."""
-    min_tls_version = specified_tls_version
-    if min_tls_version is None:
+    min_tls_version_specified = specified_tls_version
+    if min_tls_version_specified is None:
         return MIN_TLS_VERSIONS[tls_profile]
-    return min_tls_version
+    return min_tls_version_specified
 
 
 def ciphers_from_list(ciphers: Optional[list[str]]) -> Optional[str]:
@@ -136,7 +136,7 @@ def ciphers_as_string(
     ciphers: Optional[list[str]], tls_profile: TLSProfiles
 ) -> Optional[str]:
     """Retrieve ciphers as one string for custom list of TLS profile-based list."""
-    ciphers_as_string = ciphers_from_list(ciphers)
-    if ciphers_as_string is None:
+    ciphers_as_str = ciphers_from_list(ciphers)
+    if ciphers_as_str is None:
         return ciphers_for_tls_profile(tls_profile)
-    return ciphers_as_string
+    return ciphers_as_str

tests/e2e/test_api.py

@@ -91,8 +91,8 @@ def teardown_module(module):
         must_gather()
 
 
-@pytest.fixture(scope="module")
-def postgres_connection():
+@pytest.fixture(name="postgres_connection", scope="module")
+def fixture_postgres_connection():
     """Fixture with Postgres connection."""
     return retrieve_connection()