From 7c3186da79f96e68624f28b25794923fb07c766d Mon Sep 17 00:00:00 2001 From: imperosol Date: Mon, 10 Mar 2025 10:32:00 +0100 Subject: [PATCH] apply ruff rule A005 --- accounting/views.py | 6 +++--- accounting/widgets/{select.py => ajax_select.py} | 5 ++++- club/forms.py | 2 +- club/widgets/{select.py => ajax_select.py} | 5 ++++- com/api.py | 2 +- com/forms.py | 2 +- com/{calendar.py => ics_calendar.py} | 0 com/signals.py | 2 +- com/tests/test_api.py | 2 +- com/tests/test_views.py | 4 ++-- com/views.py | 2 +- core/management/commands/populate.py | 2 +- core/views/__init__.py | 2 +- core/views/files.py | 2 +- core/views/forms.py | 2 +- core/views/group.py | 2 +- core/views/{site.py => index.py} | 0 core/views/widgets/{select.py => ajax_select.py} | 0 counter/forms.py | 6 +++--- counter/widgets/{select.py => ajax_select.py} | 5 ++++- election/views.py | 4 ++-- forum/views.py | 6 +++--- rootplace/forms.py | 2 +- sas/forms.py | 4 ++-- sas/widgets/{select.py => ajax_select.py} | 5 ++++- subscription/forms.py | 2 +- trombi/views.py | 2 +- 27 files changed, 45 insertions(+), 33 deletions(-) rename accounting/widgets/{select.py => ajax_select.py} (90%) rename club/widgets/{select.py => ajax_select.py} (83%) rename com/{calendar.py => ics_calendar.py} (100%) rename core/views/{site.py => index.py} (100%) rename core/views/widgets/{select.py => ajax_select.py} (100%) rename counter/widgets/{select.py => ajax_select.py} (93%) rename sas/widgets/{select.py => ajax_select.py} (83%) diff --git a/accounting/views.py b/accounting/views.py index f9fd8412..12128a04 100644 --- a/accounting/views.py +++ b/accounting/views.py @@ -39,12 +39,12 @@ from accounting.models import ( Operation, SimplifiedAccountingType, ) -from accounting.widgets.select import ( +from accounting.widgets.ajax_select import ( AutoCompleteSelectClubAccount, AutoCompleteSelectCompany, ) from club.models import Club -from club.widgets.select import AutoCompleteSelectClub +from club.widgets.ajax_select import AutoCompleteSelectClub from core.auth.mixins import ( CanCreateMixin, CanEditMixin, @@ -54,7 +54,7 @@ from core.auth.mixins import ( from core.models import User from core.views.forms import SelectDate, SelectFile from core.views.mixins import TabedViewMixin -from core.views.widgets.select import AutoCompleteSelectUser +from core.views.widgets.ajax_select import AutoCompleteSelectUser from counter.models import Counter, Product, Selling # Main accounting view diff --git a/accounting/widgets/select.py b/accounting/widgets/ajax_select.py similarity index 90% rename from accounting/widgets/select.py rename to accounting/widgets/ajax_select.py index 6b3145b7..76bd8382 100644 --- a/accounting/widgets/select.py +++ b/accounting/widgets/ajax_select.py @@ -2,7 +2,10 @@ from pydantic import TypeAdapter from accounting.models import ClubAccount, Company from accounting.schemas import ClubAccountSchema, CompanySchema -from core.views.widgets.select import AutoCompleteSelect, AutoCompleteSelectMultiple +from core.views.widgets.ajax_select import ( + AutoCompleteSelect, + AutoCompleteSelectMultiple, +) _js = ["bundled/accounting/components/ajax-select-index.ts"] diff --git a/club/forms.py b/club/forms.py index 76d13e2c..e63627eb 100644 --- a/club/forms.py +++ b/club/forms.py @@ -29,7 +29,7 @@ from django.utils.translation import gettext_lazy as _ from club.models import Club, Mailing, MailingSubscription, Membership from core.models import User from core.views.forms import SelectDate, SelectDateTime -from core.views.widgets.select import AutoCompleteSelectMultipleUser +from core.views.widgets.ajax_select import AutoCompleteSelectMultipleUser from counter.models import Counter diff --git a/club/widgets/select.py b/club/widgets/ajax_select.py similarity index 83% rename from club/widgets/select.py rename to club/widgets/ajax_select.py index d46bb344..36ad3e9a 100644 --- a/club/widgets/select.py +++ b/club/widgets/ajax_select.py @@ -2,7 +2,10 @@ from pydantic import TypeAdapter from club.models import Club from club.schemas import ClubSchema -from core.views.widgets.select import AutoCompleteSelect, AutoCompleteSelectMultiple +from core.views.widgets.ajax_select import ( + AutoCompleteSelect, + AutoCompleteSelectMultiple, +) _js = ["bundled/club/components/ajax-select-index.ts"] diff --git a/com/api.py b/com/api.py index 99186f36..6de78a3c 100644 --- a/com/api.py +++ b/com/api.py @@ -9,7 +9,7 @@ from ninja_extra.pagination import PageNumberPaginationExtra from ninja_extra.permissions import IsAuthenticated from ninja_extra.schemas import PaginatedResponseSchema -from com.calendar import IcsCalendar +from com.ics_calendar import IcsCalendar from com.models import News, NewsDate from com.schemas import NewsDateFilterSchema, NewsDateSchema from core.auth.api_permissions import HasPerm diff --git a/com/forms.py b/com/forms.py index 8b81a3f9..e94d697e 100644 --- a/com/forms.py +++ b/com/forms.py @@ -8,7 +8,7 @@ from django.utils import timezone from django.utils.translation import gettext_lazy as _ from club.models import Club -from club.widgets.select import AutoCompleteSelectClub +from club.widgets.ajax_select import AutoCompleteSelectClub from com.models import News, NewsDate, Poster from core.models import User from core.utils import get_end_of_semester diff --git a/com/calendar.py b/com/ics_calendar.py similarity index 100% rename from com/calendar.py rename to com/ics_calendar.py diff --git a/com/signals.py b/com/signals.py index 1c42c6e9..467159d2 100644 --- a/com/signals.py +++ b/com/signals.py @@ -1,7 +1,7 @@ from django.db.models.signals import post_delete, post_save from django.dispatch import receiver -from com.calendar import IcsCalendar +from com.ics_calendar import IcsCalendar from com.models import News diff --git a/com/tests/test_api.py b/com/tests/test_api.py index ba48f49c..7c3bcb7b 100644 --- a/com/tests/test_api.py +++ b/com/tests/test_api.py @@ -16,7 +16,7 @@ from django.utils.timezone import now from model_bakery import baker, seq from pytest_django.asserts import assertNumQueries -from com.calendar import IcsCalendar +from com.ics_calendar import IcsCalendar from com.models import News, NewsDate from core.markdown import markdown from core.models import User diff --git a/com/tests/test_views.py b/com/tests/test_views.py index ce96766e..03d28adc 100644 --- a/com/tests/test_views.py +++ b/com/tests/test_views.py @@ -305,7 +305,7 @@ class TestNewsCreation(TestCase): # we will just test that the ICS is modified. # Checking that the ICS is *well* modified is up to the ICS tests - with patch("com.calendar.IcsCalendar.make_internal") as mocked: + with patch("com.ics_calendar.IcsCalendar.make_internal") as mocked: self.client.post(reverse("com:news_new"), self.valid_payload) mocked.assert_called() @@ -314,7 +314,7 @@ class TestNewsCreation(TestCase): self.valid_payload["occurrences"] = 2 last_news = News.objects.order_by("id").last() - with patch("com.calendar.IcsCalendar.make_internal") as mocked: + with patch("com.ics_calendar.IcsCalendar.make_internal") as mocked: self.client.post( reverse("com:news_edit", kwargs={"news_id": last_news.id}), self.valid_payload, diff --git a/com/views.py b/com/views.py index e1114e57..f6e12fd2 100644 --- a/com/views.py +++ b/com/views.py @@ -43,8 +43,8 @@ from django.views.generic import DetailView, ListView, TemplateView, View from django.views.generic.edit import CreateView, DeleteView, UpdateView from club.models import Club, Mailing -from com.calendar import IcsCalendar from com.forms import NewsDateForm, NewsForm, PosterForm +from com.ics_calendar import IcsCalendar from com.models import News, NewsDate, Poster, Screen, Sith, Weekmail, WeekmailArticle from core.auth.mixins import ( CanEditPropMixin, diff --git a/core/management/commands/populate.py b/core/management/commands/populate.py index 21fde2e5..5abcb203 100644 --- a/core/management/commands/populate.py +++ b/core/management/commands/populate.py @@ -46,7 +46,7 @@ from accounting.models import ( SimplifiedAccountingType, ) from club.models import Club, Membership -from com.calendar import IcsCalendar +from com.ics_calendar import IcsCalendar from com.models import News, NewsDate, Sith, Weekmail from core.models import BanGroup, Group, Page, PageRev, SithFile, User from core.utils import resize_image diff --git a/core/views/__init__.py b/core/views/__init__.py index a53671d5..daf84693 100644 --- a/core/views/__init__.py +++ b/core/views/__init__.py @@ -65,6 +65,6 @@ class DetailFormView(FormView, BaseDetailView): # E402: putting those import at the top of the file would also be difficult from .files import * # noqa: F403 E402 from .group import * # noqa: F403 E402 +from .index import * # noqa: F403 E402 from .page import * # noqa: F403 E402 -from .site import * # noqa: F403 E402 from .user import * # noqa: F403 E402 diff --git a/core/views/files.py b/core/views/files.py index 04498d5c..8070033d 100644 --- a/core/views/files.py +++ b/core/views/files.py @@ -41,7 +41,7 @@ from core.auth.mixins import ( ) from core.models import Notification, SithFile, User from core.views.mixins import AllowFragment -from core.views.widgets.select import ( +from core.views.widgets.ajax_select import ( AutoCompleteSelectMultipleGroup, AutoCompleteSelectSithFile, AutoCompleteSelectUser, diff --git a/core/views/forms.py b/core/views/forms.py index 381fc8a3..312d0819 100644 --- a/core/views/forms.py +++ b/core/views/forms.py @@ -50,7 +50,7 @@ from PIL import Image from antispam.forms import AntiSpamEmailField from core.models import Gift, Group, Page, SithFile, User from core.utils import resize_image -from core.views.widgets.select import ( +from core.views.widgets.ajax_select import ( AutoCompleteSelect, AutoCompleteSelectGroup, AutoCompleteSelectMultipleGroup, diff --git a/core/views/group.py b/core/views/group.py index ba6b406d..dac5b395 100644 --- a/core/views/group.py +++ b/core/views/group.py @@ -30,7 +30,7 @@ from core.auth.mixins import CanEditMixin from core.models import Group, User from core.views import DetailFormView from core.views.forms import PermissionGroupsForm -from core.views.widgets.select import AutoCompleteSelectMultipleUser +from core.views.widgets.ajax_select import AutoCompleteSelectMultipleUser # Forms diff --git a/core/views/site.py b/core/views/index.py similarity index 100% rename from core/views/site.py rename to core/views/index.py diff --git a/core/views/widgets/select.py b/core/views/widgets/ajax_select.py similarity index 100% rename from core/views/widgets/select.py rename to core/views/widgets/ajax_select.py diff --git a/counter/forms.py b/counter/forms.py index 59762920..b509b515 100644 --- a/counter/forms.py +++ b/counter/forms.py @@ -2,9 +2,9 @@ from django import forms from django.utils.translation import gettext_lazy as _ from phonenumber_field.widgets import RegionalPhoneNumberWidget -from club.widgets.select import AutoCompleteSelectClub +from club.widgets.ajax_select import AutoCompleteSelectClub from core.views.forms import NFCTextInput, SelectDate, SelectDateTime -from core.views.widgets.select import ( +from core.views.widgets.ajax_select import ( AutoCompleteSelect, AutoCompleteSelectMultipleGroup, AutoCompleteSelectMultipleUser, @@ -19,7 +19,7 @@ from counter.models import ( Refilling, StudentCard, ) -from counter.widgets.select import ( +from counter.widgets.ajax_select import ( AutoCompleteSelectMultipleCounter, AutoCompleteSelectMultipleProduct, AutoCompleteSelectProduct, diff --git a/counter/widgets/select.py b/counter/widgets/ajax_select.py similarity index 93% rename from counter/widgets/select.py rename to counter/widgets/ajax_select.py index 875c0aca..45888061 100644 --- a/counter/widgets/select.py +++ b/counter/widgets/ajax_select.py @@ -1,6 +1,9 @@ from pydantic import TypeAdapter -from core.views.widgets.select import AutoCompleteSelect, AutoCompleteSelectMultiple +from core.views.widgets.ajax_select import ( + AutoCompleteSelect, + AutoCompleteSelectMultiple, +) from counter.models import Counter, Product, ProductType from counter.schemas import ( ProductTypeSchema, diff --git a/election/views.py b/election/views.py index cd367b63..25866422 100644 --- a/election/views.py +++ b/election/views.py @@ -13,12 +13,12 @@ from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateVi from core.auth.mixins import CanCreateMixin, CanEditMixin, CanViewMixin from core.views.forms import SelectDateTime -from core.views.widgets.markdown import MarkdownInput -from core.views.widgets.select import ( +from core.views.widgets.ajax_select import ( AutoCompleteSelect, AutoCompleteSelectMultipleGroup, AutoCompleteSelectUser, ) +from core.views.widgets.markdown import MarkdownInput from election.models import Candidature, Election, ElectionList, Role, Vote if TYPE_CHECKING: diff --git a/forum/views.py b/forum/views.py index 9501cf1b..3ce1fa68 100644 --- a/forum/views.py +++ b/forum/views.py @@ -42,7 +42,7 @@ from django.views.generic.edit import CreateView, DeleteView, UpdateView from haystack.query import RelatedSearchQuerySet from honeypot.decorators import check_honeypot -from club.widgets.select import AutoCompleteSelectClub +from club.widgets.ajax_select import AutoCompleteSelectClub from core.auth.mixins import ( CanCreateMixin, CanEditMixin, @@ -50,11 +50,11 @@ from core.auth.mixins import ( CanViewMixin, can_view, ) -from core.views.widgets.markdown import MarkdownInput -from core.views.widgets.select import ( +from core.views.widgets.ajax_select import ( AutoCompleteSelect, AutoCompleteSelectMultipleGroup, ) +from core.views.widgets.markdown import MarkdownInput from forum.models import Forum, ForumMessage, ForumMessageMeta, ForumTopic diff --git a/rootplace/forms.py b/rootplace/forms.py index 5e7f8e94..e5796023 100644 --- a/rootplace/forms.py +++ b/rootplace/forms.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _ from core.models import User, UserBan from core.views.forms import FutureDateTimeField, SelectDateTime -from core.views.widgets.select import AutoCompleteSelectUser +from core.views.widgets.ajax_select import AutoCompleteSelectUser class MergeForm(forms.Form): diff --git a/sas/forms.py b/sas/forms.py index 926fe6ca..d987aaf1 100644 --- a/sas/forms.py +++ b/sas/forms.py @@ -6,9 +6,9 @@ from django.utils.translation import gettext_lazy as _ from core.models import User from core.views import MultipleImageField from core.views.forms import SelectDate -from core.views.widgets.select import AutoCompleteSelectMultipleGroup +from core.views.widgets.ajax_select import AutoCompleteSelectMultipleGroup from sas.models import Album, Picture, PictureModerationRequest -from sas.widgets.select import AutoCompleteSelectAlbum +from sas.widgets.ajax_select import AutoCompleteSelectAlbum class SASForm(forms.Form): diff --git a/sas/widgets/select.py b/sas/widgets/ajax_select.py similarity index 83% rename from sas/widgets/select.py rename to sas/widgets/ajax_select.py index 1d124a27..1650a279 100644 --- a/sas/widgets/select.py +++ b/sas/widgets/ajax_select.py @@ -1,6 +1,9 @@ from pydantic import TypeAdapter -from core.views.widgets.select import AutoCompleteSelect, AutoCompleteSelectMultiple +from core.views.widgets.ajax_select import ( + AutoCompleteSelect, + AutoCompleteSelectMultiple, +) from sas.models import Album from sas.schemas import AlbumSchema diff --git a/subscription/forms.py b/subscription/forms.py index b1d00223..ed9978d4 100644 --- a/subscription/forms.py +++ b/subscription/forms.py @@ -7,7 +7,7 @@ from django.utils.translation import gettext_lazy as _ from core.models import User from core.views.forms import SelectDate, SelectDateTime -from core.views.widgets.select import AutoCompleteSelectUser +from core.views.widgets.ajax_select import AutoCompleteSelectUser from subscription.models import Subscription diff --git a/trombi/views.py b/trombi/views.py index 513a0d9c..f44458ee 100644 --- a/trombi/views.py +++ b/trombi/views.py @@ -47,7 +47,7 @@ from core.auth.mixins import ( from core.models import User from core.views.forms import SelectDate from core.views.mixins import QuickNotifMixin, TabedViewMixin -from core.views.widgets.select import AutoCompleteSelectUser +from core.views.widgets.ajax_select import AutoCompleteSelectUser from trombi.models import Trombi, TrombiClubMembership, TrombiComment, TrombiUser