fixing cyclic import problem

core/TESTS/test_imports.py

@@ -62,7 +62,7 @@ class SimpleTest(SimpleTestCase):
         from django.utils.timezone import get_current_timezone, make_aware
 
         from parsers.people import GetPersonExpeditionNameLookup
-        from troggle.core.models.logbooks import LogbookEntry, PersonTrip
+        from troggle.core.models.logbooks import CaveSlug, QM, LogbookEntry, PersonTrip
         from troggle.core.models.troggle import DataIssue, Expedition
     def test_import_core_views_caves(self):
         from django.conf import settings
@@ -74,7 +74,7 @@ class SimpleTest(SimpleTestCase):
         from troggle.core.forms import (CaveAndEntranceFormSet, CaveForm,
                                         EntranceForm, EntranceLetterForm)
         from troggle.core.models.caves import (Area, Cave, CaveAndEntrance,
-                                               CaveSlug, Entrance,
+                                               Entrance,
                                                EntranceSlug, SurvexStation)
         from troggle.core.models.troggle import Expedition
         from troggle.core.views.auth import login_required_if_public