squashme: style

Author: SalimKayal

components/renku_data_services/crc/blueprints.py

@@ -1,6 +1,7 @@
 """Compute resource control (CRC) app."""
 
 import asyncio
+from contextlib import suppress
 from dataclasses import dataclass
 
 from sanic import HTTPResponse, Request, empty, json
@@ -353,14 +354,12 @@ async def _delete(
                 member_id=member_id,
                 member_type=MemberType(member_type),
             )
-            try:
+            with suppress(errors.MissingResourceError):
                 await self.repo.revoke_resource_pool_members(
                     api_user=user,
                     resource_pool_id=resource_pool_id,
                     members=[identifier],
                 )
-            except errors.MissingResourceError:
-                pass  # Already removed or was not part of the pool
             return HTTPResponse(status=204)
 
         return "/resource_pools/<resource_pool_id>/members/<member_type>/<member_id>", ["DELETE"], _delete

components/renku_data_services/crc/db.py

@@ -1245,7 +1245,11 @@ async def _unprohibit_resource_pool_users(
     @with_db_transaction
     @Authz.authz_change(op=AuthzOperation.create, resource=ResourceType.resource_pool)
     async def _prohibit_resource_pool_users(
-        self, api_user: base_models.APIUser, resource_pool_id: int, user_ids: Collection[str], session: AsyncSession
+        self,
+        api_user: base_models.APIUser,
+        resource_pool_id: int,
+        user_ids: Collection[str],
+        session: AsyncSession | None = None,
     ) -> models.ResourcePoolMembershipChange:
         specs = [(uid, ResourceType.user, Role.PROHIBITED) for uid in user_ids]
         return self._build_pool_membership_changes(resource_pool_id, specs, Change.ADD)