diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2018-04-15 16:28:13 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2018-04-15 16:28:13 +0100 |
| commit | 758259be4d63e2a3cf6e82e4a579ae836b36b931 (patch) | |
| tree | 312e4a5dce84b3435c8ffa1799c38bd6bc4be2cc /parsers | |
| parent | 2c2c815b25a12adec18e424b288f6f5e3cda1226 (diff) | |
| download | troggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.tar.gz troggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.tar.bz2 troggle-758259be4d63e2a3cf6e82e4a579ae836b36b931.zip | |
Django 1.7 mostly working. Big refactor so probably bugs
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/QMs.py | 4 | ||||
| -rw-r--r-- | parsers/cavetab.py | 2 | ||||
| -rw-r--r-- | parsers/logbooks.py | 2 | ||||
| -rw-r--r-- | parsers/people.py | 2 | ||||
| -rw-r--r-- | parsers/subcaves.py | 2 | ||||
| -rw-r--r-- | parsers/surveys.py | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/parsers/QMs.py b/parsers/QMs.py index f9a6d89..efc8cd6 100644 --- a/parsers/QMs.py +++ b/parsers/QMs.py @@ -2,7 +2,7 @@ import csv from django.conf import settings -from core.models import QM, LogbookEntry, Cave +from troggle.core.models import QM, LogbookEntry, Cave from datetime import * from utils import save_carefully import re, os @@ -87,7 +87,7 @@ def parseCaveQMs(cave,inputFile): continue def parse_KH_QMs(kh, inputFile): - """import QMs from the 1623-161 (Kaninchenhöhle) html pages + """import QMs from the 1623-161 (Kaninchenh�hle) html pages """ khQMs=open(settings.EXPOWEB+inputFile,'r') khQMs=khQMs.readlines() diff --git a/parsers/cavetab.py b/parsers/cavetab.py index 9f04105..99202d5 100644 --- a/parsers/cavetab.py +++ b/parsers/cavetab.py @@ -4,7 +4,7 @@ from django.conf import settings import csv, time, re, os, logging from utils import save_carefully from django.core.urlresolvers import reverse -import flatpages.models +import troggle.flatpages.models ##format of CAVETAB2.CSV is KatasterNumber = 0 diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 4180345..cb40f58 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -1,7 +1,7 @@ #.-*- coding: utf-8 -*- from django.conf import settings -import core.models as models +import troggle.core.models as models from parsers.people import GetPersonExpeditionNameLookup from parsers.cavetab import GetCaveLookup diff --git a/parsers/people.py b/parsers/people.py index 7898ccd..bc18472 100644 --- a/parsers/people.py +++ b/parsers/people.py @@ -1,7 +1,7 @@ #.-*- coding: utf-8 -*- from django.conf import settings -import core.models as models +import troggle.core.models as models import csv, re, datetime, os, shutil from utils import save_carefully diff --git a/parsers/subcaves.py b/parsers/subcaves.py index 6905d0a..739af44 100644 --- a/parsers/subcaves.py +++ b/parsers/subcaves.py @@ -6,7 +6,7 @@ import sys, os import os, re, logging from django.conf import settings -from core.models import Subcave, Cave +from troggle.core.models import Subcave, Cave from utils import save_carefully def getLinksInCaveDescription(cave): diff --git a/parsers/surveys.py b/parsers/surveys.py index b94481e..26e46f9 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -3,7 +3,7 @@ import sys, os, types, logging, stat #from troggle import * #os.environ['DJANGO_SETTINGS_MODULE']='troggle.settings' import settings -from core.models import * +from troggle.core.models import * from PIL import Image #import settings #import core.models as models |