3 files changed, 33 insertions, 37 deletions
diff --git a/core/models/caves.py b/core/models/caves.py
index 084bcdd..70a13ae 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -1,33 +1,30 @@
-import string
-import os
 import datetime
-import re
 import json
-import subprocess
 import operator
-from datetime import datetime, timezone
-
+import os
+import re
+import string
+import subprocess
 from collections import defaultdict
+from datetime import datetime, timezone
 from pathlib import Path
-
 from urllib.parse import urljoin
 
-import settings
-
-from django.db import models
-from django.core.files.storage import FileSystemStorage
+from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Min, Max
-from django.conf import settings
-from django.urls import reverse
-from django.template import Context, loader
+from django.core.files.storage import FileSystemStorage
+from django.db import models
+from django.db.models import Max, Min
 from django.shortcuts import render
+from django.template import Context, loader
+from django.urls import reverse
 
-from troggle.core.models.troggle import TroggleModel, Person, Expedition, DataIssue
+import settings
 from troggle.core.models.survex import SurvexStation
-from troggle.core.utils import writetrogglefile
-from troggle.core.utils import TROG
+from troggle.core.models.troggle import (DataIssue, Expedition, Person,
+                                         TroggleModel)
+from troggle.core.utils import TROG, writetrogglefile
 
 # Use the TROG global object to cache the cave lookup list. No good for multi-user..
 Gcavelookup = TROG['caves']['gcavelookup']
diff --git a/core/models/survex.py b/core/models/survex.py
index c2a68bf..5ee3f17 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -1,14 +1,14 @@
-import os
-import re
+import datetime
 import json
 import operator
-import datetime
-from urllib.parse import urljoin
-from pathlib import Path
+import os
+import re
 from functools import reduce
+from pathlib import Path
+from urllib.parse import urljoin
 
-from django.db import models
 from django.conf import settings
+from django.db import models
 from django.urls import reverse
 
 # from troggle.core.models.troggle import DataIssue # circular import. Hmm
@@ -215,7 +215,8 @@ class Wallet(models.Model):
                                 waldata["date"] = thisdate.isoformat()
                             except:
                                 message = f"! {str(self.walletname)} Date formatting failure {thisdate}. Failed to load from {jsonfile} JSON file"
-                                from troggle.core.models.troggle import DataIssue
+                                from troggle.core.models.troggle import \
+                                    DataIssue
                                 DataIssue.objects.update_or_create(parser='scans', message=message, url=wurl) 
                         except:
                             message = f"! {str(self.walletname)} Date format not ISO {datestr}. Failed to load from {jsonfile} JSON file"
diff --git a/core/models/troggle.py b/core/models/troggle.py
index ca3df80..999e826 100644
--- a/core/models/troggle.py
+++ b/core/models/troggle.py
@@ -1,27 +1,25 @@
-import string
-import os
 import datetime
+import os
 import re
 import resource
+import string
+from decimal import Decimal, getcontext
 from subprocess import call
-
 from urllib.parse import urljoin
-from decimal import Decimal, getcontext
-getcontext().prec=2 #use 2 significant figures for decimal calculations
 
-import settings
+getcontext().prec=2 #use 2 significant figures for decimal calculations
 
-from django.db import models
+from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-from django.conf import settings
-
-from django.urls import reverse
-from django.template import Context, loader
 from django.core.files.storage import FileSystemStorage
+from django.db import models
+from django.template import Context, loader
+from django.urls import reverse
 
-import troggle.core.models.survex 
+import settings
+import troggle.core.models.survex
 from troggle.core.utils import get_process_memory
 
 """This file declares TroggleModel which inherits from django.db.models.Model