From 674cea629dbcbfd99c74261bba17d056fbabd8ac Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Mon, 22 Jun 2020 00:03:23 +0100
Subject: clean up import statements: more specific

---
 core/views_statistics.py | 55 +++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

(limited to 'core/views_statistics.py')

diff --git a/core/views_statistics.py b/core/views_statistics.py
index 9940790..889eb30 100644
--- a/core/views_statistics.py
+++ b/core/views_statistics.py
@@ -4,8 +4,6 @@ import re
 
 import django.db.models
 from django.db.models import Min, Max
-#from django.urls import reverse, resolve
-#from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render, render_to_response
 from django.template import Context, loader
 from django.template.defaultfilters import slugify
@@ -17,38 +15,37 @@ from troggle.core.models_caves import Cave, LogbookEntry
 from troggle.core.models_survex import SurvexLeg, SurvexBlock
 
 import troggle.settings as settings
-from settings import *
 
 
 def pathsreport(request):
     pathsdict={
-    "CAVEDESCRIPTIONS" : CAVEDESCRIPTIONS,
-    "DIR_ROOT" : DIR_ROOT,
-    "ENTRANCEDESCRIPTIONS" : ENTRANCEDESCRIPTIONS,
-    "EXPOUSER_EMAIL" : EXPOUSER_EMAIL,
+    "CAVEDESCRIPTIONS" : settings.CAVEDESCRIPTIONS,
+    "DIR_ROOT" : settings.DIR_ROOT,
+    "ENTRANCEDESCRIPTIONS" : settings.ENTRANCEDESCRIPTIONS,
+    "EXPOUSER_EMAIL" : settings.EXPOUSER_EMAIL,
     "EXPOUSERPASS" :"<redacted>",
-    "EXPOUSER" : EXPOUSER,
-    "EXPOWEB" : EXPOWEB,
-    "EXPOWEB_URL" : EXPOWEB_URL,
-    "FILES" : FILES,
-    "JSLIB_URL" : JSLIB_URL,
-    "LOGFILE" : LOGFILE,
-    "LOGIN_REDIRECT_URL" : LOGIN_REDIRECT_URL,
-    "MEDIA_ROOT" : MEDIA_ROOT,
-    "MEDIA_URL" : MEDIA_URL,
-    "PHOTOS_URL" : PHOTOS_URL,
-    "PYTHON_PATH" : PYTHON_PATH,
-    "REPOS_ROOT_PATH" : REPOS_ROOT_PATH,
-    "ROOT_URLCONF" : ROOT_URLCONF,
-    "STATIC_URL" : STATIC_URL,
-    "SURVEX_DATA" : SURVEX_DATA,
-    "SURVEY_SCANS" : SURVEY_SCANS,
-    "SURVEYS" : SURVEYS,
-    "SURVEYS_URL" : SURVEYS_URL,
-    "SVX_URL" : SVX_URL,
-    "THREEDCACHEDIR" : THREEDCACHEDIR,
-    "TUNNEL_DATA" : TUNNEL_DATA,
-    "URL_ROOT" : URL_ROOT
+    "EXPOUSER" : settings.EXPOUSER,
+    "EXPOWEB" : settings.EXPOWEB,
+    "EXPOWEB_URL" : settings.EXPOWEB_URL,
+    "FILES" : settings.FILES,
+    "JSLIB_URL" : settings.JSLIB_URL,
+    "LOGFILE" : settings.LOGFILE,
+    "LOGIN_REDIRECT_URL" : settings.LOGIN_REDIRECT_URL,
+    "MEDIA_ROOT" : settings.MEDIA_ROOT,
+    "MEDIA_URL" : settings.MEDIA_URL,
+    "PHOTOS_URL" : settings.PHOTOS_URL,
+    "PYTHON_PATH" : settings.PYTHON_PATH,
+    "REPOS_ROOT_PATH" : settings.REPOS_ROOT_PATH,
+    "ROOT_URLCONF" : settings.ROOT_URLCONF,
+    "STATIC_URL" : settings.STATIC_URL,
+    "SURVEX_DATA" : settings.SURVEX_DATA,
+    "SURVEY_SCANS" : settings.SURVEY_SCANS,
+    "SURVEYS" : settings.SURVEYS,
+    "SURVEYS_URL" : settings.SURVEYS_URL,
+    "SVX_URL" : settings.SVX_URL,
+    "THREEDCACHEDIR" : settings.THREEDCACHEDIR,
+    "TUNNEL_DATA" : settings.TUNNEL_DATA,
+    "URL_ROOT" : settings.URL_ROOT
     }
     # settings are unique by paths are not
     ncodes = len(pathsdict)
-- 
cgit v1.2.3