From f7d06e45e55c8b8ba709b84224311284e58d660c Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 4 Aug 2026 09:49:44 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8(backend)=20lint=20code=20with=20ne?= =?UTF-8?q?w=20ruff=200.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New ruff version need to lint the code again and adapt exceptions --- src/backend/conftest.py | 4 ++-- ...ove_is_public_add_field_attachments_and_duplicated_from.py | 2 +- src/backend/core/models.py | 4 ++-- src/backend/core/services/search_indexers.py | 4 ++-- src/backend/core/tasks/user_reconciliation.py | 2 +- .../tests/documents/test_api_documents_search_feature_flag.py | 2 +- src/backend/core/tests/test_models_documents.py | 2 +- src/backend/impress/settings.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/backend/conftest.py b/src/backend/conftest.py index 2b9e9f672..ba6f99d7e 100644 --- a/src/backend/conftest.py +++ b/src/backend/conftest.py @@ -110,7 +110,7 @@ def pytest_sessionstart(session): len(_PRE_EXISTING_OBJECTS), bucket_name, ) - except Exception: # pylint: disable=broad-except # noqa: BLE001 + except Exception: # pylint: disable=broad-except # MinIO may be unreachable (e.g. storage-less unit runs): disable cleanup. _PRE_EXISTING_OBJECTS = None logger.warning( @@ -155,5 +155,5 @@ def pytest_sessionfinish(session, exitstatus): # pylint: disable=unused-argumen deleted, bucket_name, ) - except Exception: # pylint: disable=broad-except # noqa: BLE001 + except Exception: # pylint: disable=broad-except logger.warning("S3 test cleanup failed", exc_info=True) diff --git a/src/backend/core/migrations/0020_remove_is_public_add_field_attachments_and_duplicated_from.py b/src/backend/core/migrations/0020_remove_is_public_add_field_attachments_and_duplicated_from.py index d39236fba..d9e0eee3f 100644 --- a/src/backend/core/migrations/0020_remove_is_public_add_field_attachments_and_duplicated_from.py +++ b/src/backend/core/migrations/0020_remove_is_public_add_field_attachments_and_duplicated_from.py @@ -21,7 +21,7 @@ def populate_attachments_on_all_documents(apps, schema_editor): response = default_storage.connection.meta.client.get_object( Bucket=default_storage.bucket_name, Key=f"{document.pk!s}/file" ) - except (FileNotFoundError, ClientError): + except FileNotFoundError, ClientError: pass else: content = response["Body"].read().decode("utf-8") diff --git a/src/backend/core/models.py b/src/backend/core/models.py index 26849520a..158ec2c44 100644 --- a/src/backend/core/models.py +++ b/src/backend/core/models.py @@ -1064,7 +1064,7 @@ class Document(MP_Node, BaseModel): if self._content is None and self.id: try: response = self.get_content_response() - except (FileNotFoundError, ClientError): + except FileNotFoundError, ClientError: pass else: self._content = response["Body"].read().decode("utf-8") @@ -2101,7 +2101,7 @@ class Invitation(BaseModel): roles = self.document.accesses.filter( models.Q(user=user) | models.Q(team__in=teams), ).values_list("role", flat=True) - except (self._meta.model.DoesNotExist, IndexError): + except self._meta.model.DoesNotExist, IndexError: roles = [] is_admin_or_owner = bool( diff --git a/src/backend/core/services/search_indexers.py b/src/backend/core/services/search_indexers.py index 2aa56d9fc..cd00fa872 100644 --- a/src/backend/core/services/search_indexers.py +++ b/src/backend/core/services/search_indexers.py @@ -186,7 +186,7 @@ class BaseDocumentIndexer(ABC): """ # pylint: disable=too-many-arguments, too-many-positional-arguments - def search( # noqa : PLR0913 + def search( # noqa : PLR0913, PLR0917 self, q: str, token: str, @@ -248,7 +248,7 @@ class FindDocumentIndexer(BaseDocumentIndexer): """ # pylint: disable=too-many-arguments, too-many-positional-arguments - def search( # noqa : PLR0913 + def search( # noqa : PLR0913, PLR0917 self, q: str, token: str, diff --git a/src/backend/core/tasks/user_reconciliation.py b/src/backend/core/tasks/user_reconciliation.py index cdcfbb1d9..15124a044 100644 --- a/src/backend/core/tasks/user_reconciliation.py +++ b/src/backend/core/tasks/user_reconciliation.py @@ -46,7 +46,7 @@ def _process_row(row, job, counters): for inactive_email in inactive_emails: try: validate_email(inactive_email) - except (ValidationError, ValueError): + except ValidationError, ValueError: job.send_reconciliation_error_email( recipient_email=active_email, other_email=inactive_email ) diff --git a/src/backend/core/tests/documents/test_api_documents_search_feature_flag.py b/src/backend/core/tests/documents/test_api_documents_search_feature_flag.py index bd28468d2..2f0bfb5a9 100644 --- a/src/backend/core/tests/documents/test_api_documents_search_feature_flag.py +++ b/src/backend/core/tests/documents/test_api_documents_search_feature_flag.py @@ -42,7 +42,7 @@ pytestmark = pytest.mark.django_db ) @pytest.mark.usefixtures("indexer_settings") # pylint: disable=too-many-arguments, too-many-positional-arguments -def test_api_documents_search_success( # noqa : PLR0913 +def test_api_documents_search_success( # noqa : PLR0913, PLR0917 mock_search_using_indexer, mock_search_using_database, activated_flags, diff --git a/src/backend/core/tests/test_models_documents.py b/src/backend/core/tests/test_models_documents.py index bd1ee59ed..bc63b122a 100644 --- a/src/backend/core/tests/test_models_documents.py +++ b/src/backend/core/tests/test_models_documents.py @@ -883,7 +883,7 @@ def test_models_documents_get_abilities_preset_role(django_assert_num_queries): ], ) # pylint: disable=too-many-arguments, too-many-positional-arguments -def test_models_documents_get_abilities_children_destroy( # noqa: PLR0913 +def test_models_documents_get_abilities_children_destroy( # noqa: PLR0913, PLR0917 is_authenticated, is_creator, role, diff --git a/src/backend/impress/settings.py b/src/backend/impress/settings.py index 7c94fb9f5..491b7fc96 100755 --- a/src/backend/impress/settings.py +++ b/src/backend/impress/settings.py @@ -46,7 +46,7 @@ def get_release(): with open(os.path.join(BASE_DIR, "pyproject.toml"), "rb") as f: pyproject_data = tomllib.load(f) return pyproject_data["project"]["version"] - except (FileNotFoundError, KeyError): + except FileNotFoundError, KeyError: return "NA" # Default: not available