diff options
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/caves.py | 5 | ||||
| -rw-r--r-- | parsers/locations.py | 5 | ||||
| -rw-r--r-- | parsers/logbooks.py | 7 | ||||
| -rw-r--r-- | parsers/people.py | 2 | ||||
| -rw-r--r-- | parsers/survex.py | 8 |
5 files changed, 11 insertions, 16 deletions
diff --git a/parsers/caves.py b/parsers/caves.py index 1954dbb..4ae5b29 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -2,14 +2,13 @@ import os import re import string import sys - from pathlib import Path from django.conf import settings from django.db import transaction -from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, GetCaveLookup -from troggle.core.models.survex import SurvexStation +from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, GetCaveLookup +from troggle.core.models.survex import SurvexStation from troggle.core.models.troggle import DataIssue from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS, EXPOWEB, SURVEX_DATA diff --git a/parsers/locations.py b/parsers/locations.py index d89ea76..ec0a4ff 100644 --- a/parsers/locations.py +++ b/parsers/locations.py @@ -7,17 +7,16 @@ import time from datetime import datetime, timezone from pathlib import Path - import troggle.settings as settings from troggle.core.models.caves import Cave, Entrance from troggle.core.models.logbooks import QM from troggle.core.models.survex import SurvexBlock, SurvexFile, SurvexPersonRole, SurvexStation -from troggle.core.models.wallets import Wallet from troggle.core.models.troggle import DataIssue, Expedition +from troggle.core.models.wallets import Wallet from troggle.core.utils import chaosmonkey, get_process_memory from troggle.parsers.logbooks import GetCaveLookup from troggle.parsers.people import GetPersonExpeditionNameLookup, known_foreigner -from troggle.parsers.survex import stash_data_issue, store_data_issues, ROOTBLOCK +from troggle.parsers.survex import ROOTBLOCK, stash_data_issue, store_data_issues """Uses the imported data to find the locations of the survey stations labelled as entrances diff --git a/parsers/logbooks.py b/parsers/logbooks.py index abcf199..2ede83f 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -1,9 +1,8 @@ import os import re -import sys import string +import sys import time - from datetime import date, datetime from pathlib import Path from random import randint @@ -11,11 +10,11 @@ from random import randint from django.conf import settings from django.template.defaultfilters import slugify -from parsers.people import GetPersonExpeditionNameLookup, load_people_expos, known_foreigner +from parsers.people import GetPersonExpeditionNameLookup, known_foreigner, load_people_expos from troggle.core.models.caves import GetCaveLookup from troggle.core.models.logbooks import LogbookEntry, PersonLogEntry from troggle.core.models.troggle import DataIssue, Expedition -from troggle.core.utils import get_process_memory, alphabet_suffix, unique_slug +from troggle.core.utils import alphabet_suffix, get_process_memory, unique_slug EPOCH = settings.EPOCH """ diff --git a/parsers/people.py b/parsers/people.py index 2d7c5b0..5037dae 100644 --- a/parsers/people.py +++ b/parsers/people.py @@ -3,9 +3,9 @@ import os import re from html import unescape from pathlib import Path -from unidecode import unidecode from django.conf import settings +from unidecode import unidecode from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition diff --git a/parsers/survex.py b/parsers/survex.py index bdfb1f4..22f5ef5 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -11,12 +11,10 @@ import troggle.settings as settings from troggle.core.models.caves import Cave, Entrance, GetCaveLookup from troggle.core.models.logbooks import QM from troggle.core.models.survex import SurvexBlock, SurvexFile, SurvexPersonRole, SurvexStation -from troggle.core.models.wallets import Wallet from troggle.core.models.troggle import DataIssue, Expedition -from troggle.core.utils import chaosmonkey, get_process_memory -from troggle.core.utils import write_and_commit - -from troggle.parsers.caves import create_new_cave, do_ARGE_cave, AREACODES, ARGEAREAS +from troggle.core.models.wallets import Wallet +from troggle.core.utils import chaosmonkey, get_process_memory, write_and_commit +from troggle.parsers.caves import AREACODES, ARGEAREAS, create_new_cave, do_ARGE_cave from troggle.parsers.people import GetPersonExpeditionNameLookup, known_foreigner """Imports the tree of survex files following from a defined root .svx file |