diff --git a/app/finger/admin.py b/app/finger/admin.py index abd34b8..0128127 100644 --- a/app/finger/admin.py +++ b/app/finger/admin.py @@ -8,7 +8,7 @@ from django.http import HttpResponseRedirect from datetime import datetime, timedelta from django.urls import reverse -from django.utils.html import escape, mark_safe +from django.utils.html import mark_safe from post_office import mail from post_office.models import EmailTemplate import csv @@ -173,7 +173,7 @@ def export_ths(modeladmin, request, queryset): if user.ths_claimed(): writer.writerow([user_name, user_email]) else: - writer.writerow([f"Stacken User {user_number}", f"not-ths-member@stacken.kth.se"]) + writer.writerow([f"Stacken User {user_number}", "not-ths-member@stacken.kth.se"]) user_number += 1 diff --git a/app/finger/forms.py b/app/finger/forms.py index a1cefc0..c1279cd 100644 --- a/app/finger/forms.py +++ b/app/finger/forms.py @@ -1,5 +1,4 @@ from django import forms -from django.core.mail import send_mail from django.contrib.auth import forms as ca_forms from django.forms import ValidationError import json @@ -14,7 +13,7 @@ class UploadFileForm(forms.Form): def clean_file(self): try: return json.load(self.cleaned_data["file"]) - except: + except Exception: raise ValidationError("Must be proper json", code="badjson") diff --git a/app/finger/management/commands/readjson.py b/app/finger/management/commands/readjson.py index 79154c6..09228df 100644 --- a/app/finger/management/commands/readjson.py +++ b/app/finger/management/commands/readjson.py @@ -1,7 +1,5 @@ -from django.conf import settings from django.core.management.base import BaseCommand from django.db import transaction -from optparse import make_option from finger.models import Member import json diff --git a/app/finger/management/commands/stackenadmin.py b/app/finger/management/commands/stackenadmin.py index b0aef1e..1586e59 100644 --- a/app/finger/management/commands/stackenadmin.py +++ b/app/finger/management/commands/stackenadmin.py @@ -1,7 +1,4 @@ -from django.conf import settings from django.core.management.base import BaseCommand -from django.db import transaction -from optparse import make_option from finger.models import User from os import environ from dateutil import parser diff --git a/app/finger/management/commands/updatedb.py b/app/finger/management/commands/updatedb.py index d68b3d1..36244da 100644 --- a/app/finger/management/commands/updatedb.py +++ b/app/finger/management/commands/updatedb.py @@ -1,8 +1,5 @@ -from datetime import datetime -from django.conf import settings from django.core.management.base import BaseCommand from django.db import transaction -from optparse import make_option from finger.models import Member from finger.models import User diff --git a/app/finger/models.py b/app/finger/models.py index 27fba1f..cbbeaca 100644 --- a/app/finger/models.py +++ b/app/finger/models.py @@ -26,7 +26,7 @@ def list_to_str(self, the_list): def has_signed_contract(self, username): if self.is_valid_user({"användarnamn": username}): - return not "(" in username + return "(" not in username else: return False diff --git a/app/finger/views.py b/app/finger/views.py index e9137bb..76cd713 100644 --- a/app/finger/views.py +++ b/app/finger/views.py @@ -10,7 +10,7 @@ from services.models import Service from .forms import MailMembersForm, PasswordResetForm, UploadFileForm -from .models import Member, User +from .models import Member @login_required @@ -79,7 +79,7 @@ def mail_members(request): messages = [(subject, message, sender, email) for (_, email) in recipients] try: send_mass_mail(messages, fail_silently=False) - except: + except Exception: context["exception"] = sys.exc_info() return render(request, "mail_members_test.html", context) diff --git a/app/services/views.py b/app/services/views.py index 4da7330..8c33262 100644 --- a/app/services/views.py +++ b/app/services/views.py @@ -40,7 +40,7 @@ def passwords(request, name): if since: try: since = datetime.strptime(since, "%Y-%m-%dT%H:%M:%S%Z") - except: + except Exception: return JsonResponse({"msg": "Bad date"}, status=400) query = query.filter(modified__gte=since)