Merge pull request #844 from SUNET/ylle-more-ruf-rules

Enable RUF010 and RUF015 ruff rules

Author: johanlundberg

ruff.toml

@@ -32,9 +32,7 @@ ignore = [
   "SIM102",   # collapsible-if
   "SIM103",   # return-bool-condition-directly (keeping explicit if/else for clarity)
   "SIM108",   # if-else-block-instead-of-if-exp
-  "RUF010",   # use conversion flag instead
   "RUF012",   # mutable class attributes
-  "RUF015",   # single element slices
 
   # Since we use ruff as a formatter, the following rules should be ignored
   # See: https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules

src/eduid/common/rpc/am_relay.py

@@ -77,4 +77,4 @@ def ping(self, timeout: int = 1) -> str:
             return rtask.get(timeout=timeout)
         except Exception as e:
             rtask.forget()
-            raise AmTaskFailed(f"ping task failed: {repr(e)}") from e
+            raise AmTaskFailed(f"ping task failed: {e!r}") from e

src/eduid/common/rpc/lookup_mobile_relay.py

@@ -46,4 +46,4 @@ def ping(self, timeout: int = 1) -> str:
             return rtask.get(timeout=timeout)
         except Exception as e:
             rtask.forget()
-            raise LookupMobileTaskFailed(f"ping task failed: {repr(e)}") from e
+            raise LookupMobileTaskFailed(f"ping task failed: {e!r}") from e

src/eduid/common/rpc/msg_relay.py

@@ -267,7 +267,7 @@ def sendsms(self, recipient: str, message: str, reference: str, timeout: int = 2
             logger.info(f"SMS with reference {reference} sent. Task result: {res}")
         except Exception as e:
             rtask.forget()
-            raise MsgTaskFailed(f"sendsms task failed: {repr(e)}") from e
+            raise MsgTaskFailed(f"sendsms task failed: {e!r}") from e
 
     def ping(self, timeout: int = 1) -> str:
         """
@@ -279,4 +279,4 @@ def ping(self, timeout: int = 1) -> str:
             return rtask.get(timeout=timeout)
         except Exception as e:
             rtask.forget()
-            raise MsgTaskFailed(f"ping task failed: {repr(e)}") from e
+            raise MsgTaskFailed(f"ping task failed: {e!r}") from e

src/eduid/graphdb/groupdb/db.py

@@ -246,12 +246,12 @@ def get_group(self, identifier: str) -> Group | None:
         group_data: Node | None  # please mypy
         if len(group_graph.relationships) == 0:
             # Just a group with no owners or members
-            group_data = [node_data for node_data in group_graph.nodes][0]
+            group_data = next(iter(group_graph.nodes))
             assert group_data is not None
             return self._load_group(group_data)
         else:
             # Grab the first relationships end node and create the group from that
-            group_data = [node_data.end_node for node_data in group_graph.relationships][0]
+            group_data = next(iter(group_graph.relationships)).end_node
             assert group_data is not None
             group = self._load_group(group_data)
 

src/eduid/maccapi/middleware.py

@@ -88,7 +88,7 @@ async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -
             )
 
         if not data_owner or data_owner not in self.context.config.data_owners:
-            self.context.logger.error(f"Data owner {repr(data_owner)} not configured")
+            self.context.logger.error(f"Data owner {data_owner!r} not configured")
             return return_error_response(status_code=status.HTTP_401_UNAUTHORIZED, detail="Unknown data_owner")
 
         assert isinstance(request.context, MaccAPIContext)  # please mypy

src/eduid/maccapi/tests/test_maccapi.py

@@ -26,7 +26,7 @@ def setUp(self) -> None:
 
     def _make_bearer_token(self, claims: Mapping[str, Any]) -> str:
         token = jwt.JWT(header={"alg": "ES256"}, claims=claims)
-        jwk = list(self.context.jwks)[0]
+        jwk = next(iter(self.context.jwks))
         token.make_signed_token(jwk)
         return token.serialize()
 

src/eduid/queue/workers/base.py

@@ -109,7 +109,7 @@ async def process_new_item(self, document_id: str) -> None:
             try:
                 await self.handle_new_item(queue_item)
             except Exception as e:
-                logger.exception(f"QueueItem processing failed with: {repr(e)}")
+                logger.exception(f"QueueItem processing failed with: {e!r}")
 
     async def handle_change(self, change: ChangeEvent) -> None:
         """

src/eduid/satosa/scimapi/common.py

@@ -40,4 +40,4 @@ def get_metadata(context: satosa.context.Context) -> Generator[MetaData]:
 
 def get_internal_attribute_name(converter: AttributeMapper, attr_name: str) -> str:
     _int = converter.to_internal("saml", {attr_name: ["something"]})
-    return list(_int.keys())[0]
+    return next(iter(_int.keys()))

src/eduid/satosa/scimapi/scim_attributes.py

@@ -59,7 +59,7 @@ def __init__(
         # Get the internal attribute name for the eduPersonPrincipalName that will be
         # used to find users in the SCIM database
         _int = self.converter.to_internal("saml", {"eduPersonPrincipalName": "something"})
-        self.ext_id_attr = list(_int.keys())[0]
+        self.ext_id_attr = next(iter(_int.keys()))
         logger.debug(f"SCIM externalId internal attribute name: {self.ext_id_attr}")
 
     def get_userdb_for_data_owner(self, data_owner: str) -> ScimApiUserDB:
@@ -155,7 +155,7 @@ def _process_user(self, user: ScimApiUser, data: satosa.internal.InternalData) -
             for _name, _new in update.items():
                 _old = data.attributes.get(_name)
                 if _old != _new:
-                    logger.debug(f"Changing attribute {_name} from {repr(_old)} to {repr(_new)}")
+                    logger.debug(f"Changing attribute {_name} from {_old!r} to {_new!r}")
                     data.attributes[_name] = _new
 
         # Look for a linked account suitable for use for MFA stepup (in the stepup plugin that runs after this one)