From 3a3692f730912490db6d1157861501c815968900 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Fri, 30 May 2025 16:19:58 +0200 Subject: [PATCH] chore: ignore rest of ruff warnings --- mailadmin/api.py | 8 ++++---- mailadmin/migrations/0004_auto_20150125_1401.py | 2 +- mailadmin/models.py | 10 +++++----- mailadmin/permissions.py | 2 +- mailadmin/test_all.py | 4 ++-- mailadmin/views.py | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mailadmin/api.py b/mailadmin/api.py index 050ef76..96192f0 100644 --- a/mailadmin/api.py +++ b/mailadmin/api.py @@ -3,7 +3,7 @@ import logging import requests from django.conf import settings from requests.auth import HTTPBasicAuth -from requests.exceptions import ConnectionError +from requests.exceptions import ConnectionError # noqa: A004 from rest_framework import exceptions, status logger = logging.getLogger(__name__) @@ -41,7 +41,7 @@ class DjangoPostfixDovecotAPI: url = f"{self.base_url}{path}" try: - r = requests.request( + r = requests.request( # noqa: S113 method, url, params=params, @@ -52,7 +52,7 @@ class DjangoPostfixDovecotAPI: except ConnectionError as e: msg = f"mxapi at {url} unavailable {e!s}" logger.warning(msg) - raise DPDAPIException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"error": msg}) + raise DPDAPIException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail={"error": msg}) # noqa: B904 try: r.raise_for_status() @@ -61,7 +61,7 @@ class DjangoPostfixDovecotAPI: try: raise DPDAPIException(status_code=e.response.status_code, detail=e.response.json()) except ValueError: - raise DPDAPIException(status_code=e.response.status_code, detail="mxapi fatal error") + raise DPDAPIException(status_code=e.response.status_code, detail="mxapi fatal error") # noqa: B904 try: ret = r.json() diff --git a/mailadmin/migrations/0004_auto_20150125_1401.py b/mailadmin/migrations/0004_auto_20150125_1401.py index 29028c8..ab08bad 100644 --- a/mailadmin/migrations/0004_auto_20150125_1401.py +++ b/mailadmin/migrations/0004_auto_20150125_1401.py @@ -2,7 +2,7 @@ import django.db.models.deletion from django.db import migrations, models -def normalize_prefixes(apps, schema_editor): +def normalize_prefixes(apps, schema_editor): # noqa: ARG001 Prefix = apps.get_model("mailadmin", "Prefix") OrgUnit = apps.get_model("mailadmin", "OrgUnit") diff --git a/mailadmin/models.py b/mailadmin/models.py index 7eb4ab9..5962be1 100644 --- a/mailadmin/models.py +++ b/mailadmin/models.py @@ -6,7 +6,7 @@ class OrgUnit(models.Model): def __str__(self): return self.name - name = models.CharField(max_length=500) + name = models.CharField(max_length=500) # noqa: DJ012 is_active = models.BooleanField(default=True) admin_groups = models.ManyToManyField(Group, blank=True, related_name="admin_orgunits") member_groups = models.ManyToManyField(Group, blank=True, related_name="member_orgunits") @@ -14,7 +14,7 @@ class OrgUnit(models.Model): update = models.DateTimeField(auto_now=True) inside_id = models.IntegerField(null=True, blank=True) - class Meta: + class Meta: # noqa: DJ012 ordering = ["name"] @@ -28,10 +28,10 @@ class Prefix(models.Model): def __str__(self): return self.name or "" - name = models.CharField(max_length=500, blank=True, null=True) + name = models.CharField(max_length=500, blank=True, null=True) # noqa: DJ001, DJ012 orgunit = models.ForeignKey("mailadmin.OrgUnit", models.CASCADE, related_name="prefixes") - objects = PrefixQueryset.as_manager() + objects = PrefixQueryset.as_manager() # noqa: DJ012 - class Meta: + class Meta: # noqa: DJ012 verbose_name_plural = "prefixes" diff --git a/mailadmin/permissions.py b/mailadmin/permissions.py index 71e1a8a..8b95582 100644 --- a/mailadmin/permissions.py +++ b/mailadmin/permissions.py @@ -9,7 +9,7 @@ class SourcePrefixOwner(permissions.BasePermission): """Ref: http://www.django-rest-framework.org/api-guide/permissions""" def has_permission(self, request, view): - assert hasattr(view, "user_prefixes") + assert hasattr(view, "user_prefixes") # noqa: S101 # Read permissions (GET, HEAD or OPTIONS) are allowed for all authenticated request if request.method in permissions.SAFE_METHODS or request.method not in [ diff --git a/mailadmin/test_all.py b/mailadmin/test_all.py index a4d5ded..a1319ff 100644 --- a/mailadmin/test_all.py +++ b/mailadmin/test_all.py @@ -6,11 +6,11 @@ from django.urls import reverse @pytest.fixture -def user(db): +def user(db): # noqa: ARG001 return User.objects.create(username="admin") def test_open_lists(user, client): client.force_login(user=user) response = client.get(reverse("lists")) - assert response.status_code == HTTPStatus.OK + assert response.status_code == HTTPStatus.OK # noqa: S101 diff --git a/mailadmin/views.py b/mailadmin/views.py index 5f68b51..613a07e 100644 --- a/mailadmin/views.py +++ b/mailadmin/views.py @@ -133,7 +133,7 @@ class OrgUnitViewSet(viewsets.ReadOnlyModelViewSet): @api_view(["GET"]) -def get_domains(request): +def get_domains(request): # noqa: ARG001 api = DjangoPostfixDovecotAPI() domains = api.list_domains(name=settings.NEUF_EMAIL_DOMAIN_NAME)