From 9e9793ba0606d032fb96b9eb8c2ded4ade98930a Mon Sep 17 00:00:00 2001
From: Anna Sidwell <anna@takkaria.org>
Date: Tue, 20 Aug 2019 01:17:23 +0200
Subject: [PATCH] Clean up file app

---
 apps/files/urls.py  | 19 +++++++------------
 apps/files/views.py |  8 ++++----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/apps/files/urls.py b/apps/files/urls.py
index 0de410a..129abfa 100644
--- a/apps/files/urls.py
+++ b/apps/files/urls.py
@@ -1,19 +1,14 @@
-from django.conf.urls import url
+from django.urls import path
 
-from .views import FileDeleteView
-from .views import FileUploadView
-from .views import ImageFileDeleteView
-from .views import ImageFileUploadView
+from . import views
 
 app_name = "files"
 
 urlpatterns = [
-    url(r"^upload/$", FileUploadView.as_view(), name="upload"),
-    url(r"^upload/image/$", ImageFileUploadView.as_view(), name="upload_image"),
-    url(r"^delete/(?P<pk>\d+)/$", FileDeleteView.as_view(), name="delete"),
-    url(
-        r"^delete/image/(?P<pk>\d+)/$",
-        ImageFileDeleteView.as_view(),
-        name="delete_image",
+    path("upload/", views.FileUpload.as_view(), name="upload"),
+    path("upload/image/", views.ImageFileUpload.as_view(), name="upload_image"),
+    path("delete/<int:pk>/", views.FileDelete.as_view(), name="delete"),
+    path(
+        "delete/image/<int:pk>/", views.ImageFileDelete.as_view(), name="delete_image"
     ),
 ]
diff --git a/apps/files/views.py b/apps/files/views.py
index 24c925a..74cf055 100644
--- a/apps/files/views.py
+++ b/apps/files/views.py
@@ -10,7 +10,7 @@ from .models import File
 from .models import ImageFile
 
 
-class FileUploadView(LoginRequiredMixin, FormView):
+class FileUpload(LoginRequiredMixin, FormView):
     model = File
     form_class = FileForm
 
@@ -32,12 +32,12 @@ class FileUploadView(LoginRequiredMixin, FormView):
         return JsonResponse({"is_valid": False, "errors": form.errors})
 
 
-class ImageFileUploadView(FileUploadView):
+class ImageFileUpload(FileUpload):
     model = ImageFile
     form_class = ImageFileForm
 
 
-class FileDeleteView(LoginRequiredMixin, DetailView):
+class FileDelete(LoginRequiredMixin, DetailView):
     model = File
 
     def get(self, request, *args, **kwargs):
@@ -54,5 +54,5 @@ class FileDeleteView(LoginRequiredMixin, DetailView):
         return JsonResponse({"success": True})
 
 
-class ImageFileDeleteView(FileDeleteView):
+class ImageFileDelete(FileDelete):
     model = ImageFile