From 39247b3e460cfd83c8834da07f7d544e837f338d Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Mon, 20 Nov 2023 21:26:14 +0000 Subject: [PATCH] flake8 --- fet2020/authentications/views.py | 2 +- fet2020/fet2020/settings.py | 2 +- fet2020/finance/forms.py | 11 +++++------ fet2020/gallery/forms.py | 5 ++++- fet2020/gallery/management/commands/create_thumbs.py | 1 + fet2020/intern/models.py | 6 +++--- fet2020/members/forms.py | 5 ++++- fet2020/members/serializers.py | 5 ++++- fet2020/members/validators.py | 7 +++++-- fet2020/posts/admin.py | 6 +++--- fet2020/posts/forms.py | 2 +- fet2020/posts/views.py | 4 ++-- fet2020/search/legacy.py | 4 ++-- 13 files changed, 36 insertions(+), 24 deletions(-) diff --git a/fet2020/authentications/views.py b/fet2020/authentications/views.py index 66974e6d..998921ab 100644 --- a/fet2020/authentications/views.py +++ b/fet2020/authentications/views.py @@ -25,7 +25,7 @@ def logoutUser(request): try: response = redirect(request.GET.get("next")) - except: + except Exception: response = redirect("home") response = del_ep_cookie(request, response) diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 228c74cf..f0ebc4d4 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -219,7 +219,7 @@ TEMPLATES = [ ROOT_URLCONF = "fet2020.urls" -### THIRD-PARTY ### +# --- THIRD-PARTY --- # CKEDITOR CKEDITOR_UPLOAD_PATH = "upload" diff --git a/fet2020/finance/forms.py b/fet2020/finance/forms.py index 32f67107..20ae469c 100644 --- a/fet2020/finance/forms.py +++ b/fet2020/finance/forms.py @@ -91,13 +91,12 @@ class BillCreateForm(forms.ModelForm): def clean(self): cleaned_data = super().clean() - amount = cleaned_data.get("amount") + # amount = cleaned_data.get("amount") resolution = cleaned_data.get("resolution_text") payer = cleaned_data.get("payer") name = cleaned_data.get("name_text") iban = cleaned_data.get("iban_text") - bic = cleaned_data.get("bic_text") only_digital = cleaned_data.get("only_digital") file_field = cleaned_data.get("file_field") @@ -106,20 +105,20 @@ class BillCreateForm(forms.ModelForm): if resolution != "": try: Resolution.objects.get(id=resolution) - except: + except Exception: raise ValidationError( f"Es gibt keinen Beschluss mit dieser ID. (Eingegebene ID: {resolution})" ) # check that amount is valid because invalid amount is a NoneType. - ''' + """ if amount: if amount > 30 and resolution == "": raise ValidationError( "Die Beschlussnummer fehlt, weil der Betrag über 30€ beträgt " f"(Betrag: {amount}€)." ) - ''' + """ if payer == "M": if name == "" or iban == "": @@ -133,7 +132,7 @@ class BillCreateForm(forms.ModelForm): cleaned_data["bic_text"] = "" if only_digital and file_field is None: - raise ValidationError(f"Digitale Rechnung fehlt.") + raise ValidationError("Digitale Rechnung fehlt.") return cleaned_data diff --git a/fet2020/gallery/forms.py b/fet2020/gallery/forms.py index 0fc36d38..498b6c5b 100644 --- a/fet2020/gallery/forms.py +++ b/fet2020/gallery/forms.py @@ -19,7 +19,10 @@ class AlbumAdminForm(forms.ModelForm): help_texts = { "folder_name": "Füge den Ordnername (ohne Pfade) ein.", - "thumbnail": "Füge den vollständigen Dateiname (ohne Pfade) ein, wenn dieser als Thumbnail verwendet werden soll.", + "thumbnail": ( + "Füge den vollständigen Dateiname (ohne Pfade) ein, wenn dieser als Thumbnail " + "verwendet werden soll." + ), } def __init__(self, *args, **kwargs): diff --git a/fet2020/gallery/management/commands/create_thumbs.py b/fet2020/gallery/management/commands/create_thumbs.py index d84ea5b5..216aaedb 100644 --- a/fet2020/gallery/management/commands/create_thumbs.py +++ b/fet2020/gallery/management/commands/create_thumbs.py @@ -7,6 +7,7 @@ from gallery.utils import create_thumbs, get_folder_list logger = logging.getLogger(__name__) + class Command(BaseCommand): def handle(self, *args, **options): for folder in get_folder_list(): diff --git a/fet2020/intern/models.py b/fet2020/intern/models.py index a53e4a1b..700707d2 100644 --- a/fet2020/intern/models.py +++ b/fet2020/intern/models.py @@ -158,9 +158,9 @@ class Etherpad(models.Model): pad_name = slugify(str(self.slug_id) + "-" + self.title[:40]) if len(pad_name) > 50: raise ValidationError( - _( - "Name zum Erstellen des Etherpads ist zu lange - max. 50 Zeichen. " - "(Länge: %(length)s, Name: %(pad_name)s)" + ( + "Name zum Erstellen des Etherpads ist zu lange - max. 50 Zeichen. (" + "Länge: %(length)s, Name: %(pad_name)s)" ), params={"length": len(pad_name), "pad_name": pad_name}, ) diff --git a/fet2020/members/forms.py b/fet2020/members/forms.py index 4d937141..a5cb23ef 100644 --- a/fet2020/members/forms.py +++ b/fet2020/members/forms.py @@ -49,7 +49,10 @@ class MemberForm(forms.ModelForm): model = Member help_texts = { - "image": "Mindestdimension: 150*150 px, maximale Größe: 10MB, erlaubtes Format: Bildformate.", + "image": ( + "Mindestdimension: 150*150 px, maximale Größe: 10MB, erlaubtes Format: " + "Bildformate." + ), "mailaccount": "Die Mailadresse mit '@fet.at' angeben.", } diff --git a/fet2020/members/serializers.py b/fet2020/members/serializers.py index f7bbf1ac..34d44c69 100644 --- a/fet2020/members/serializers.py +++ b/fet2020/members/serializers.py @@ -52,7 +52,10 @@ class JobMemberSerializer(serializers.HyperlinkedModelSerializer): # def create(self, validated_data): # member_data = validated_data.pop('member') # print(member_data) -# member = Member.objects.get(firstname=member_data['firstname'], surname=member_data['surname']) +# member = Member.objects.get( +# firstname=member_data['firstname'], +# surname=member_data['surname'], +# ) # # job_data = validated_data.pop('job') # print(job_data) diff --git a/fet2020/members/validators.py b/fet2020/members/validators.py index 159c95c5..e58887e1 100644 --- a/fet2020/members/validators.py +++ b/fet2020/members/validators.py @@ -5,11 +5,14 @@ from django.utils.deconstruct import deconstructible @deconstructible class PhoneNumberValidator(RegexValidator): regex = r"^\+?1?\d{9,15}$" - message = "Telefonnummer muss in diesem Format +999999999999 eingegeben werden. Bis zu 15 Zahlen sind erlaubt." + message = ( + "Telefonnummer muss in diesem Format +999999999999 eingegeben werden. Bis zu 15 Zahlen " + "sind erlaubt." + ) def validate_domainonly_email(value): - if not "fet.at" in value: + if "fet.at" not in value: raise ValidationError("In der Mailadresse fehlt die richtige Domäne.") diff --git a/fet2020/posts/admin.py b/fet2020/posts/admin.py index 300065f1..6e2245b7 100644 --- a/fet2020/posts/admin.py +++ b/fet2020/posts/admin.py @@ -13,7 +13,7 @@ def make_fetmeeting(self, request, queryset): if not agenda_key: self.message_user( request, - f"Das Agenda konnte nicht erstellt werden. Error: {str(e)}", + "Das Agenda konnte nicht erstellt werden.", messages.ERROR, ) return @@ -22,7 +22,7 @@ def make_fetmeeting(self, request, queryset): if not protocol_key: self.message_user( request, - f"Das Protokoll konnte nicht erstellt werden. Error: {str(e)}", + "Das Protokoll konnte nicht erstellt werden.", messages.ERROR, ) return @@ -36,7 +36,7 @@ def make_fetmeeting(self, request, queryset): ) self.message_user( request, - f"Das Event qs.title wurde erfolgreich in eine FET Sitzung konvertiert.", + "Das Event qs.title wurde erfolgreich in eine FET Sitzung konvertiert.", messages.SUCCESS, ) diff --git a/fet2020/posts/forms.py b/fet2020/posts/forms.py index 3c31a6e8..282f81c1 100644 --- a/fet2020/posts/forms.py +++ b/fet2020/posts/forms.py @@ -163,7 +163,7 @@ class PostSearchForm(forms.Form): years = range(last_post.date.year, first_post.date.year - 1, -1) year_choices = [("", "Alle")] + [(i, i) for i in years] self.fields["year"].choices = year_choices - except: + except Exception: pass diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index 3efc018a..38d2453c 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -227,7 +227,7 @@ class PostUpdateView(LoginRequiredMixin, UpdateView): q.update({"event_end": f"{event_end_0} {event_end_1}"}) q._mutable = _mutable - except Exception as e: + except Exception: pass return kwargs @@ -274,7 +274,7 @@ class FetMeetingCreateView(LoginRequiredMixin, CreateView): q.update({"event_end": f"{event_end_0} {event_end_1}"}) q._mutable = _mutable - except Exception as e: + except Exception: pass return kwargs diff --git a/fet2020/search/legacy.py b/fet2020/search/legacy.py index a20e5068..7f20446d 100644 --- a/fet2020/search/legacy.py +++ b/fet2020/search/legacy.py @@ -15,7 +15,7 @@ elasticsearch.logger.setLevel(elasticsearch.logging.WARN) # Verbinde mit Client @contextlib.contextmanager def es_client(): - logging.debug(f"ELASIC HOST:%s" % ELASTIC_HOST) + logging.debug("ELASIC HOST: %s", ELASTIC_HOST) client = Elasticsearch( ELASTIC_HOST, verify_certs=False, basic_auth=("elastic", ELASTIC_PASSWORD) ) @@ -68,7 +68,7 @@ def es_sorting(): def es_search(query: str): - logging.debug(f"Run Search for legacy :%s" % query) + logging.debug("Run Search for legacy: %s", query) with es_client() as client: result = client.search( index=ELASTIC_INDEX,