Added E20* ruff rules, and fixed warnings

c8y3 · c8y3 · commit 2105ca1cbb0c · 2025-10-29T15:39:34.000+01:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.ruff.lint]
 preview = true
-select = ["ARG003", "ARG005", "B00", "E101", "E225", "E23", "E24", "E3", "E4", "E7", "E9", "F", "FURB142", "FURB145", "FURB148", "PLR0402", "RET506", "RUF029", "RUF100", "TID252", "UP032", "W29"]
+select = ["ARG003", "ARG005", "B00", "E101", "E20", "E225", "E23", "E24", "E3", "E4", "E7", "E9", "F", "FURB142", "FURB145", "FURB148", "PLR0402", "RET506", "RUF029", "RUF100", "TID252", "UP032", "W29"]
 ignore = ["E402", "E711", "E712", "E721", "E722"]
 
 [tool.vulture]
diff --git a/source/app/blueprints/rest/v2/manage_routes/groups.py b/source/app/blueprints/rest/v2/manage_routes/groups.py
@@ -81,7 +81,7 @@ def update(self, identifier):
             return response_api_not_found()
 
     def delete(self, identifier):
-        try :
+        try:
             group = groups_get(identifier)
             groups_delete(iris_current_user, group)
             return response_api_deleted()
diff --git a/source/app/blueprints/rest/v2/manage_routes/users.py b/source/app/blueprints/rest/v2/manage_routes/users.py
@@ -79,7 +79,7 @@ def update(self, identifier):
             return response_api_not_found()
 
     def delete(self, identifier):
-        try :
+        try:
             user = users_get(identifier)
             users_delete(user)
             return response_api_deleted()
diff --git a/source/app/iris_engine/access_control/utils.py b/source/app/iris_engine/access_control/utils.py
@@ -369,7 +369,7 @@ def ac_set_new_case_access(user, case_id, customer_id):
     # Add customer permissions for all users belonging to the customer
     if customer_id:
         users_client = get_user_access_levels_by_customer(customer_id)
-        users_map = { u.user_id: u.access_level for u in users_client }
+        users_map = {u.user_id: u.access_level for u in users_client}
         ac_add_user_effective_access_from_map(users_map, case_id)
 
 
diff --git a/source/app/iris_engine/updater/updater.py b/source/app/iris_engine/updater/updater.py
@@ -324,7 +324,7 @@ def call_ext_updater(update_archive, scope, need_reboot):
                           '1' if need_reboot else '0',                      # Do we need to restart the app
                           '&'])
 
-    except Exception as e :
+    except Exception as e:
         log.error(str(e))
         return False
 
diff --git a/tests/tests_rest_alerts_filters.py b/tests/tests_rest_alerts_filters.py
@@ -36,7 +36,7 @@ def test_create_alert_filter_should_return_201(self):
             'filter_type': 'alerts',
             'filter_name': 'filter name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -76,7 +76,7 @@ def test_create_alert_filter_should_return_filter_type(self):
             'filter_type': filter_type,
             'filter_name': 'filter name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -106,7 +106,7 @@ def test_create_alert_filter_should_return_filter_name(self):
             'filter_type': 'alerts',
             'filter_name': filter_name,
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -136,7 +136,7 @@ def test_create_alert_filter_should_return_in_filter_data_alert_title(self):
             'filter_type': 'alerts',
             'filter_name': 'filter_name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': alert_title,
                 'alert_description': '',
                 'alert_source': '',
@@ -165,7 +165,7 @@ def test_get_alert_filter_should_return_200(self):
             'filter_type': 'alerts',
             'filter_name': 'filter name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -198,7 +198,7 @@ def test_get_alert_filter_should_return_filter_name(self):
             'filter_type': 'alerts',
             'filter_name': filter_name,
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -235,7 +235,7 @@ def test_get_alert_filter_should_return_404_when_user_has_not_created_alert_filt
             'filter_type': 'alerts',
             'filter_name': 'filter_name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -267,7 +267,7 @@ def test_update_alert_filter_should_return_200(self):
             'filter_type': 'alerts',
             'filter_name': 'filter name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -303,7 +303,7 @@ def test_update_alert_filter_should_return_filter_name(self):
             'filter_type': 'alerts',
             'filter_name': 'old name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -339,7 +339,7 @@ def test_update_alert_filter_should_return_filter_description(self):
             'filter_type': 'alerts',
             'filter_name': 'old name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -375,7 +375,7 @@ def test_update_alert_filter_should_return_filter_type(self):
             'filter_type': 'alerts',
             'filter_name': 'old name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -411,7 +411,7 @@ def test_update_alert_filter_should_return_filter_data_alert_title(self):
             'filter_type': 'alerts',
             'filter_name': 'old name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -435,7 +435,7 @@ def test_update_alert_filter_should_return_filter_data_alert_title(self):
         response = self._subject.create('/api/v2/alerts-filters', body).json()
         identifier = response['filter_id']
         body = {
-            'filter_data':  { 'alert_title' : alert_title },
+            'filter_data':  {'alert_title': alert_title},
         }
         response = self._subject.update(f'/api/v2/alerts-filters/{identifier}', body).json()
         self.assertEqual(alert_title, response['filter_data']['alert_title'])
@@ -446,7 +446,7 @@ def test_update_alert_filter_should_return_404_when_alert_filter_is_not_found(se
             'filter_type': 'alerts',
             'filter_name': 'old name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -463,13 +463,12 @@ def test_update_alert_filter_should_return_404_when_alert_filter_is_not_found(se
                 'source_reference': '',
                 'case_id': '',
                 'custom_conditions': '',
-
             }
         }
 
         response = self._subject.create('/api/v2/alerts-filters', body).json()
         body = {
-            'filter_data':  { 'alert_title' : 'alert_title' },
+            'filter_data':  {'alert_title': 'alert_title'},
         }
         response = self._subject.update(f'/api/v2/alerts-filters/{_IDENTIFIER_FOR_NONEXISTENT_OBJECT}', body)
         self.assertEqual(404, response.status_code)
@@ -480,7 +479,7 @@ def test_delete_alert_filter_should_return_204(self):
             'filter_type': 'alerts',
             'filter_name': 'old name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -516,7 +515,7 @@ def test_get_alert_filter_should_return_404_after_delete_alert_filter(self):
             'filter_type': 'alerts',
             'filter_name': 'old name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
@@ -549,7 +548,7 @@ def test_update_alert_filter_should_return_400(self):
             'filter_type': 'alerts',
             'filter_name': 'filter name',
             'filter_description': 'filter description',
-            'filter_data' : {
+            'filter_data': {
                 'alert_title': 'filter name',
                 'alert_description': '',
                 'alert_source': '',
diff --git a/tests/tests_rest_assets.py b/tests/tests_rest_assets.py
@@ -270,7 +270,7 @@ def test_get_assets_should_accept_order_by_query_parameter(self):
         self._subject.create(f'/api/v2/cases/{case_identifier}/assets', body).json()
         body = {'asset_type_id': 1, 'asset_name': 'asset1'}
         self._subject.create(f'/api/v2/cases/{case_identifier}/assets', body).json()
-        response = self._subject.get(f'/api/v2/cases/{case_identifier}/assets', { 'order_by': 'asset_name' }).json()
+        response = self._subject.get(f'/api/v2/cases/{case_identifier}/assets', {'order_by': 'asset_name'}).json()
         self.assertEqual('asset1', response['data'][0]['asset_name'])
 
     def test_get_assets_should_return_200_when_user_has_read_only_access_to_case(self):
diff --git a/tests/tests_rest_cases.py b/tests/tests_rest_cases.py
@@ -196,33 +196,33 @@ def test_create_case_should_return_field_case_customer(self):
 
     def test_update_case_should_return_200(self):
         identifier = self._subject.create_dummy_case()
-        response = self._subject.update(f'/api/v2/cases/{identifier}', { 'case_name': 'new name' })
+        response = self._subject.update(f'/api/v2/cases/{identifier}', {'case_name': 'new name'})
         self.assertEqual(200, response.status_code)
 
     def test_update_case_should_allow_to_update_severity(self):
         identifier = self._subject.create_dummy_case()
-        response = self._subject.update(f'/api/v2/cases/{identifier}', { 'severity_id': 5 }).json()
+        response = self._subject.update(f'/api/v2/cases/{identifier}', {'severity_id': 5}).json()
         self.assertEqual(5, response['severity_id'])
 
     def test_update_case_should_allow_to_update_classification(self):
         identifier = self._subject.create_dummy_case()
-        response = self._subject.update(f'/api/v2/cases/{identifier}', { 'classification_id': 3 }).json()
+        response = self._subject.update(f'/api/v2/cases/{identifier}', {'classification_id': 3}).json()
         self.assertEqual(3, response['classification_id'])
 
     def test_update_case_should_allow_to_update_owner(self):
         user = self._subject.create_dummy_user()
         identifier = self._subject.create_dummy_case()
-        response = self._subject.update(f'/api/v2/cases/{identifier}', { 'owner_id': user.get_identifier() }).json()
+        response = self._subject.update(f'/api/v2/cases/{identifier}', {'owner_id': user.get_identifier()}).json()
         self.assertEqual(user.get_identifier(), response['owner']['id'])
 
     def test_update_case_should_allow_to_update_state(self):
         identifier = self._subject.create_dummy_case()
-        response = self._subject.update(f'/api/v2/cases/{identifier}', { 'state_id': 2 }).json()
+        response = self._subject.update(f'/api/v2/cases/{identifier}', {'state_id': 2}).json()
         self.assertEqual(2, response['state']['state_id'])
 
     def test_update_case_should_allow_to_update_status(self):
         identifier = self._subject.create_dummy_case()
-        response = self._subject.update(f'/api/v2/cases/{identifier}', { 'status_id': 2 }).json()
+        response = self._subject.update(f'/api/v2/cases/{identifier}', {'status_id': 2}).json()
         self.assertEqual(2, response['status_id'])
 
     def test_update_case_should_allow_to_update_customer(self):
diff --git a/tests/tests_rest_groups.py b/tests/tests_rest_groups.py
@@ -118,7 +118,7 @@ def test_update_group_should_return_field_group_auto_follow(self):
         body = {'group_name': 'name', 'group_description': 'description'}
         response = self._subject.create('/api/v2/manage/groups', body).json()
         identifier = response['group_id']
-        body = {'group_name': 'new_name', 'group_description': 'new_description', 'group_permissions': 1, 'group_auto_follow' : True}
+        body = {'group_name': 'new_name', 'group_description': 'new_description', 'group_permissions': 1, 'group_auto_follow': True}
         response = self._subject.update(f'/api/v2/manage/groups/{identifier}', body).json()
         self.assertEqual(True, response['group_auto_follow'])
 
diff --git a/tests/tests_rest_tasks.py b/tests/tests_rest_tasks.py
@@ -177,7 +177,7 @@ def test_get_tasks_should_honour_per_page_pagination_parameter(self):
         self._subject.create(f'/api/v2/cases/{case_identifier}/tasks', body).json()
         body = {'task_assignees_id': [], 'task_status_id': 1, 'task_title': 'task3'}
         self._subject.create(f'/api/v2/cases/{case_identifier}/tasks', body).json()
-        response = self._subject.get(f'/api/v2/cases/{case_identifier}/tasks', { 'per_page': 2 }).json()
+        response = self._subject.get(f'/api/v2/cases/{case_identifier}/tasks', {'per_page': 2}).json()
         self.assertEqual(2, len(response['data']))
 
     def test_get_tasks_should_return_current_page(self):
@@ -188,7 +188,7 @@ def test_get_tasks_should_return_current_page(self):
         self._subject.create(f'/api/v2/cases/{case_identifier}/tasks', body).json()
         body = {'task_assignees_id': [], 'task_status_id': 1, 'task_title': 'task3'}
         self._subject.create(f'/api/v2/cases/{case_identifier}/tasks', body).json()
-        response = self._subject.get(f'/api/v2/cases/{case_identifier}/tasks', { 'page': 2, 'per_page': 2 }).json()
+        response = self._subject.get(f'/api/v2/cases/{case_identifier}/tasks', {'page': 2, 'per_page': 2}).json()
         self.assertEqual(2, response['current_page'])
 
     def test_get_tasks_should_return_correct_task_uuid(self):
