ruf cleanup imports, bigly.

1 files changed, 6 insertions, 13 deletions

diff --git a/core/views/caves.py b/core/views/caves.py
index 3ffbbbb..168e076 100644
--- a/core/views/caves.py
+++ b/core/views/caves.py
@@ -1,24 +1,18 @@
 import os
 import re
-import string
 import subprocess
-import urllib.parse
 from pathlib import Path
 
-from django import forms
-from django.conf import settings
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.http import HttpResponse, HttpResponseNotFound, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render
-from django.urls import NoReverseMatch, reverse
+from django.shortcuts import render
+from django.urls import NoReverseMatch
 
-import settings
 import troggle.settings as settings
 from troggle.core.forms import CaveAndEntranceFormSet, CaveForm, EntranceForm, EntranceLetterForm
-from troggle.core.models.caves import Area, Cave, CaveAndEntrance, Entrance, EntranceSlug, GetCaveLookup, SurvexStation
+from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, EntranceSlug, GetCaveLookup
 from troggle.core.models.logbooks import CaveSlug, QM
-from troggle.core.models.troggle import DataIssue, Expedition
-from troggle.core.utils import write_and_commit, writetrogglefile
+from troggle.core.utils import write_and_commit
 from troggle.core.views import expo
 
 from .auth import login_required_if_public
@@ -107,13 +101,13 @@ def getnotablecaves():
             caves = Cave.objects.all().filter(kataster_number=kataster_number)
             for c in caves:
                 # print(c.kataster_number, c.slug())
-                if c.slug() != None:
+                if c.slug() is not None:
                     notablecaves.append(c)
     return notablecaves
 
 
 def caveindex(request):
-    caves = Cave.objects.all()
+    Cave.objects.all()
     caves1623 = list(Cave.objects.filter(area__short_name="1623"))
     caves1626 = list(Cave.objects.filter(area__short_name="1626"))
     caves1623.sort(key=caveKey)
@@ -201,7 +195,6 @@ def file3d(request, cave, cave_id):
     survexpath = Path(settings.SURVEX_DATA, cave.survex_file)
     threedname = Path(survexname).with_suffix(".3d")  # removes .svx, replaces with .3d
     threedpath = Path(settings.SURVEX_DATA, threedname)
-    threedcachedir = Path(settings.SURVEX_DATA)
 
     # These if statements need refactoring more cleanly
     if cave.survex_file: