From 4ebba7f74a3cf6346f51966eead825e6e4516765 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Tue, 16 Jun 2020 19:23:25 +0300
Subject: [PATCH] Cleaning imports

---
 members/views.py | 17 +----------------
 webapp/admin.py  |  2 +-
 webapp/forms.py  |  5 -----
 webapp/tables.py |  3 ---
 webapp/views.py  | 18 +++++++-----------
 5 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 webapp/forms.py
 delete mode 100644 webapp/tables.py

diff --git a/members/views.py b/members/views.py
index f233c7b..678a32c 100644
--- a/members/views.py
+++ b/members/views.py
@@ -1,31 +1,16 @@
 """File containing Members application views."""
 
-from django.shortcuts import render
-from django.contrib.auth.decorators import permission_required
-from django.views.decorators.http import require_http_methods
-from django.views.decorators.csrf import ensure_csrf_cookie
-from django.http import HttpResponse, HttpResponseRedirect
-from django.core.mail import send_mail
 from django.conf import settings
 from django.utils.translation import ugettext as _
-from django.forms.models import model_to_dict
 
 # Email validation
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.utils.http import urlsafe_base64_encode
-from django.utils.encoding import force_bytes
 
-import json
-import requests
 import logging
-import html
-import csv
-import pickle
 from smtplib import SMTPAuthenticationError
 
-from members.models import Member, Request, Payment
-from members.forms import MemberForm, PaymentForm, ApplicationForm, CSVValidationError
+from members.models import Member, Request
 from members.views.utils import send_mail_wrapper
 
 
diff --git a/webapp/admin.py b/webapp/admin.py
index 04d51cf..a9927b4 100644
--- a/webapp/admin.py
+++ b/webapp/admin.py
@@ -2,7 +2,7 @@
 
 from django.contrib import admin
 from webapp.models import Official, Role, Committee, Occupation
-from webapp.models import Feed, Tag, BaseFeed, Event, Signup, SignupForm, TemplateQuestion
+from webapp.models import Feed, Tag, Event, Signup, SignupForm, TemplateQuestion
 from modeltranslation.admin import TranslationAdmin
 from django.contrib.auth.models import Permission
 # this is needed so that the models get registered for translation
diff --git a/webapp/forms.py b/webapp/forms.py
deleted file mode 100644
index 4bda047..0000000
--- a/webapp/forms.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""File containing webapp forms."""
-
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-from django.core.exceptions import ValidationError
diff --git a/webapp/tables.py b/webapp/tables.py
deleted file mode 100644
index bc9d26a..0000000
--- a/webapp/tables.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import django_tables2 as tables
-from django.db.models import Count, Q
-from django.utils.translation import ugettext as _
diff --git a/webapp/views.py b/webapp/views.py
index 0890501..89111a1 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -1,24 +1,20 @@
 """Webapp views."""
 
-import jwt
-import json
+from jwt import decode
+from jwt.exceptions import InvalidSignatureError
 from django.utils import timezone
 from dealer.git import git
 from django.conf import settings
-from django.contrib.auth import authenticate
-from django.http import HttpResponseBadRequest, HttpResponse, JsonResponse
-from django.shortcuts import redirect, render
+from django.http import HttpResponse, JsonResponse
+from django.shortcuts import render
 from django.views.decorators.http import require_http_methods
 from django_filters import rest_framework as filters
 from django.core.exceptions import ObjectDoesNotExist
 from rest_framework import permissions, routers, viewsets
 from rest_framework.filters import OrderingFilter, SearchFilter
 from rest_framework.permissions import IsAuthenticatedOrReadOnly
-from rest_framework.response import Response
-from rest_framework.reverse import reverse
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
-import logging
 
 from webapp.models import Event, SignupForm, Signup, TemplateQuestion, Feed, Committee, Occupation, Tag
 from webapp.serializers import (EventSerializer, SignupFormSerializer, SignupSerializer,
@@ -82,8 +78,8 @@ class SignupViewSet(viewsets.ModelViewSet):
     # search_fields = '__all__'
 
     def create(self, request, *args, **kwargs):
+        id = request.data["signupForm_id"]
         try:
-            id = request.data["signupForm_id"]
             answer = request.data["answer"]
             form = SignupForm.objects.get(id=id)
             if (form.visible):
@@ -184,8 +180,8 @@ def nginx_jwt_resp(request, *args, **kwargs):
     if not cookie:
         return HttpResponse("", status=401)
     try:
-        token = jwt.decode(cookie, settings.SECRET_KEY)
-    except jwt.exceptions.InvalidSignatureError:
+        token = decode(cookie, settings.SECRET_KEY)
+    except InvalidSignatureError:
         return HttpResponse("", status=403)
     user = 'admin' if token.get('username', '') == 'admin' else 'moderator'
     resp = HttpResponse("", status=200)