diff options
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/QMs.py | 2 | ||||
| -rw-r--r-- | parsers/cavetab.py | 2 | ||||
| -rw-r--r-- | parsers/logbooks.py | 2 | ||||
| -rw-r--r-- | parsers/subcaves.py | 7 | ||||
| -rw-r--r-- | parsers/survex.py | 2 | ||||
| -rw-r--r-- | parsers/surveys.py | 4 |
6 files changed, 7 insertions, 12 deletions
diff --git a/parsers/QMs.py b/parsers/QMs.py index ef38c3f..b259bf1 100644 --- a/parsers/QMs.py +++ b/parsers/QMs.py @@ -2,7 +2,7 @@ import csv from django.conf import settings -from expo.models import QM, LogbookEntry, Cave +from core.models import QM, LogbookEntry, Cave from datetime import * from troggle.save_carefully import save_carefully import re, os diff --git a/parsers/cavetab.py b/parsers/cavetab.py index d0fb052..1a73f9e 100644 --- a/parsers/cavetab.py +++ b/parsers/cavetab.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*-
-import troggle.expo.models as models
+import troggle.core.models as models
from django.conf import settings
import csv, time, re, os, logging
from troggle.save_carefully import save_carefully
diff --git a/parsers/logbooks.py b/parsers/logbooks.py index ebfd54e..70805ca 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -1,7 +1,7 @@ #.-*- coding: utf-8 -*-
from django.conf import settings
-import expo.models as models
+import core.models as models
from parsers.people import GetPersonExpeditionNameLookup
from parsers.cavetab import GetCaveLookup
diff --git a/parsers/subcaves.py b/parsers/subcaves.py index 024a229..b8ee4d2 100644 --- a/parsers/subcaves.py +++ b/parsers/subcaves.py @@ -4,14 +4,9 @@ This module is the part of troggle that parses descriptions of cave parts (subca import sys, os
-sys.path.append('C:\\troggle')
-sys.path.append('C:\\')
-os.environ['DJANGO_SETTINGS_MODULE']='troggle.settings'
-import troggle.expo as expo
-
import os, re, logging
from django.conf import settings
-from expo.models import Subcave, Cave
+from core.models import Subcave, Cave
from troggle.save_carefully import save_carefully
def getLinksInCaveDescription(cave):
diff --git a/parsers/survex.py b/parsers/survex.py index 93f708e..2360300 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -1,5 +1,5 @@ import troggle.settings as settings -import troggle.expo.models as models +import troggle.core.models as models from troggle.parsers.people import GetPersonExpeditionNameLookup diff --git a/parsers/surveys.py b/parsers/surveys.py index da94fe6..0a15d25 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -3,10 +3,10 @@ import sys, os, types, logging #from troggle import *
#os.environ['DJANGO_SETTINGS_MODULE']='troggle.settings'
import troggle.settings as settings
-from troggle.expo.models import *
+from troggle.core.models import *
from PIL import Image
#import settings
-#import expo.models as models
+#import core.models as models
import csv
import re
import datetime
|