move models_caves to models/caves.py

This commit is contained in:
Philip Sargent
2021-04-13 00:47:17 +01:00
parent 5b3b0e67e9
commit 957169d9aa
17 changed files with 20 additions and 20 deletions

View File

@@ -29,7 +29,7 @@ class SimpleTest(SimpleTestCase):
def test_import_TroggleModel(self):
from troggle.core.models.troggle import TroggleModel
def test_import_Cave(self):
from troggle.core.models_caves import Cave
from troggle.core.models.caves import Cave
def test_import_parsers_surveys(self):
from PIL import Image
from troggle.core.utils import save_carefully
@@ -37,12 +37,12 @@ class SimpleTest(SimpleTestCase):
def test_import_parsers_survex(self):
import troggle.settings as settings
import troggle.core.models.troggle as models
import troggle.core.models_caves as models_caves
import troggle.core.models.caves as models_caves
import troggle.core.models_survex as models_survex
from troggle.parsers.people import GetPersonExpeditionNameLookup
from troggle.core.views.caves import MapLocations
def test_import_parsers_QMs(self):
from troggle.core.models_caves import QM, Cave, LogbookEntry
from troggle.core.models.caves import QM, Cave, LogbookEntry
def test_import_parsers_people(self):
from html.parser import HTMLParser
from unidecode import unidecode
@@ -50,14 +50,14 @@ class SimpleTest(SimpleTestCase):
from django.template.defaultfilters import slugify
from django.utils.timezone import get_current_timezone, make_aware
from troggle.core.models.troggle import DataIssue, Expedition
from troggle.core.models_caves import Cave, LogbookEntry, PersonTrip
from troggle.core.models.caves import Cave, LogbookEntry, PersonTrip
from parsers.people import GetPersonExpeditionNameLookup
def test_import_core_views_caves(self):
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import get_object_or_404, render
import troggle.core.views.expo
from troggle.core.models.troggle import Expedition
from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation
from troggle.core.models.caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation
from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm
from troggle.core.views.login import login_required_if_public
from django.contrib.auth.decorators import login_required