diff options
Diffstat (limited to 'core/views/survex.py')
-rw-r--r-- | core/views/survex.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/core/views/survex.py b/core/views/survex.py index 8b9b508..0a4c7f1 100644 --- a/core/views/survex.py +++ b/core/views/survex.py @@ -1,25 +1,25 @@ -import re -import os import datetime import difflib -from pathlib import Path +import os +import re import socket +from pathlib import Path from django import forms -from django.http import HttpResponseRedirect, HttpResponse, Http404 +from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist +from django.http import Http404, HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.template.context_processors import csrf from django.views.decorators.csrf import ensure_csrf_cookie -from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned - -import troggle.settings as settings import parsers.survex -from troggle.core.models.troggle import Expedition, Person, PersonExpedition -from troggle.core.models.survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory -from troggle.core.models.caves import Cave, PersonTrip, LogbookEntry +import troggle.settings as settings +from troggle.core.models.caves import Cave, LogbookEntry, PersonTrip +from troggle.core.models.survex import (SurvexBlock, SurvexDirectory, + SurvexFile, SurvexPersonRole) +from troggle.core.models.troggle import Expedition, Person, PersonExpedition +from troggle.core.utils import WriteAndCommitError, only_commit from troggle.parsers.people import GetPersonExpeditionNameLookup -from troggle.core.utils import only_commit, WriteAndCommitError '''Everything that views survexfiles but also displays data on a cave or caves when there is ambiguity |