diff options
author | Philip Sargent <philip.sargent@gmail.com> | 2023-01-19 18:35:56 +0000 |
---|---|---|
committer | Philip Sargent <philip.sargent@gmail.com> | 2023-01-19 18:35:56 +0000 |
commit | be9fcc522a0e8dd95167236b30deb936ca6a4721 (patch) | |
tree | e1f6c7a78e49b8ee28315b188148f35a02053996 /core/views/other.py | |
parent | 939d3970aad3d1e5cf0de4e7ed09bed78e0404bb (diff) | |
download | troggle-be9fcc522a0e8dd95167236b30deb936ca6a4721.tar.gz troggle-be9fcc522a0e8dd95167236b30deb936ca6a4721.tar.bz2 troggle-be9fcc522a0e8dd95167236b30deb936ca6a4721.zip |
sort imports using isort. tested.
Diffstat (limited to 'core/views/other.py')
-rw-r--r-- | core/views/other.py | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/core/views/other.py b/core/views/other.py index 0f3a414..0e02180 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -1,23 +1,26 @@ -import re, os +import os +import re import subprocess from pathlib import Path from django import forms - from django.conf import settings -from django.urls import reverse +from django.core.files.storage import FileSystemStorage, default_storage from django.db.models import Q from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.template import Context, loader -from django.core.files.storage import FileSystemStorage, default_storage +from django.urls import reverse -from troggle.parsers.imports import import_caves, import_people, import_surveyscans -from troggle.parsers.imports import import_logbooks, import_QMs, import_drawingsfiles, import_survex +from troggle.core.models.caves import QM, Cave, LogbookEntry, PersonTrip +from troggle.core.models.survex import DrawingFile # from databaseReset import reinit_db # don't do this. databaseRest runs code *at import time* from troggle.core.models.troggle import Expedition, Person, PersonExpedition -from troggle.core.models.caves import LogbookEntry, QM, Cave, PersonTrip -from troggle.core.models.survex import DrawingFile +from troggle.parsers.imports import (import_caves, import_drawingsfiles, + import_logbooks, import_people, + import_QMs, import_survex, + import_surveyscans) + from .auth import login_required_if_public '''Utility functions and code to serve the control panel and individual user's @@ -37,18 +40,18 @@ def todos(request, module): '''produces todo text from module We could automate this to find all those strings automatically ''' + from troggle.core.forms import todo as forms + from troggle.core.middleware import todo as middleware + from troggle.core.models.caves import todo as modelcaves from troggle.core.TESTS.tests import todo as tests - from troggle.core.views.logbooks import todo as viewlogbooks - from troggle.core.views.survex import todo as viewsurvex from troggle.core.views.caves import todo as viewcaves from troggle.core.views.drawings import todo as viewdrawings + from troggle.core.views.logbooks import todo as viewlogbooks + from troggle.core.views.survex import todo as viewsurvex from troggle.parsers.caves import todo as parserscaves - from troggle.parsers.logbooks import todo as parserslogbooks from troggle.parsers.drawings import todo as parsersdrawings + from troggle.parsers.logbooks import todo as parserslogbooks from troggle.parsers.survex import todo as parserssurvex - from troggle.core.models.caves import todo as modelcaves - from troggle.core.middleware import todo as middleware - from troggle.core.forms import todo as forms tododict = {'views/other': todo, 'tests': tests, 'views/logbooks': viewlogbooks, |