[svn] Renaming troggle.expo to troggle.core. To do this, used:

perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`

and then manually checked each change (had to remove a couple)

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

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

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

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):

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
 

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