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

core/admin.py

@@ -1,12 +1,12 @@
-from troggle.expo.models import *
+from troggle.core.models import *
 from django.contrib import admin
 from feincms.admin import editor
 from django.forms import ModelForm
 import django.forms as forms
-from expo.forms import LogbookEntryForm
+from core.forms import LogbookEntryForm
 from django.http import HttpResponse
 from django.core import serializers
-from expo.views_other import downloadLogbook
+from core.views_other import downloadLogbook
 #from troggle.reversion.admin import VersionAdmin #django-reversion version control
 
 #overriding admin save so we have the new since parsing field

core/context.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from expo.models import Expedition
+from core.models import Expedition
 
 def troggle_context(request):
     return { 'settings':settings, 'Expedition':Expedition }

core/models.py

@@ -591,7 +591,7 @@ class Photo(TroggleImageModel):
     lat_utm = models.FloatField(blank=True,null=True)
     
     class IKOptions:
-        spec_module = 'expo.imagekit_specs'
+        spec_module = 'core.imagekit_specs'
         cache_dir = 'thumbs'
         image_field = 'file'
         
@@ -620,7 +620,7 @@ class ScannedImage(TroggleImageModel):
     lat_utm = models.FloatField(blank=True,null=True)
 
     class IKOptions:
-        spec_module = 'expo.imagekit_specs'
+        spec_module = 'core.imagekit_specs'
         cache_dir = 'thumbs'
         image_field = 'file'
     #content_type = models.ForeignKey(ContentType)

core/randSent.py

@@ -1,6 +1,6 @@
 import troggle.settings as settings
 from django import forms
-from troggle.expo.models import LogbookEntry
+from troggle.core.models import LogbookEntry
 import random
 import re
 

core/templatetags/wiki_markup.py

@@ -3,7 +3,7 @@ from django.utils.html import conditional_escape
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
 from django.conf import settings
-from expo.models import QM, Photo
+from core.models import QM, Photo
 import re, urlparse
 
 register = template.Library()

core/views_caves.py

@@ -1,5 +1,5 @@
-from troggle.expo.models import Cave, CaveAndEntrance, Survey, Expedition, QM
-import troggle.expo.models as models
+from troggle.core.models import Cave, CaveAndEntrance, Survey, Expedition, QM
+import troggle.core.models as models
 import troggle.settings as settings
 from django.forms.models import formset_factory
 import search

core/views_logbooks.py

@@ -1,10 +1,10 @@
 from django.shortcuts import render_to_response
-from troggle.expo.models import Expedition, Person, PersonExpedition, PersonTrip, LogbookEntry
+from troggle.core.models import Expedition, Person, PersonExpedition, PersonTrip, LogbookEntry
 import troggle.settings as settings
 from django.db import models
 from troggle.parsers.logbooks import LoadLogbookForExpedition
 from troggle.parsers.people import GetPersonExpeditionNameLookup
-from troggle.expo.forms import PersonForm
+from troggle.core.forms import PersonForm
 from  django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 

core/views_other.py

@@ -1,4 +1,4 @@
-from troggle.expo.models import Cave, Expedition, Person, LogbookEntry, PersonExpedition, PersonTrip, Photo
+from troggle.core.models import Cave, Expedition, Person, LogbookEntry, PersonExpedition, PersonTrip, Photo
 import troggle.settings as settings
 from django import forms
 from django.template import loader, Context
@@ -9,7 +9,7 @@ import randSent
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from troggle.alwaysUseRequestContext import render_response # see views_logbooks for explanation on this.
-from expo.models import *
+from core.models import *
 
 def showrequest(request):
     return HttpResponse(request.GET)

export/tocavetab.py

@@ -1,4 +1,4 @@
-import troggle.expo.models as models
+import troggle.core.models as models
 from django.conf import settings
 
 import csv, re, os

export/toqms.py

@@ -1,4 +1,4 @@
-import troggle.expo.models as models
+import troggle.core.models as models
 from django.conf import settings
 
 import csv

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

profiles/views.py

@@ -14,7 +14,7 @@ from django.template import RequestContext
 from django.views.generic.list_detail import object_list
 from django import forms
 
-from expo.models import Person
+from core.models import Person
 
 from troggle.alwaysUseRequestContext import render_response
 

save_carefully.py

@@ -7,7 +7,7 @@ def save_carefully(objectType, lookupAttribs={}, nonLookupAttribs={}):
             -if instance exists in DB and was not modified using Troggle: overwrite instance, return (instance, False)
             
         The checking is accomplished using Django's get_or_create and the new_since_parsing boolean field
-        defined in expo.models.TroggleModel.
+        defined in core.models.TroggleModel.
     
     """
     

settings.py

@@ -54,7 +54,7 @@ TEMPLATE_LOADERS = (
 #   'django.template.loaders.eggs.load_template_source',
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.auth", "expo.context.troggle_context", ) 
+TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.auth", "core.context.troggle_context", ) 
 
 LOGIN_REDIRECT_URL = '/'
 
@@ -70,7 +70,7 @@ ROOT_URLCONF = 'troggle.urls'
 
 ACCOUNT_ACTIVATION_DAYS=3
 
-AUTH_PROFILE_MODULE = 'expo.person'
+AUTH_PROFILE_MODULE = 'core.person'
 
 INSTALLED_APPS = (
     'django.contrib.admin',
@@ -84,7 +84,7 @@ INSTALLED_APPS = (
     #'django_evolution',
     'troggle.registration',
     'troggle.profiles',
-    'troggle.expo',
+    'troggle.core',
     'troggle.imagekit', 
     'mptt', #This is django-mptt (modifed preorder tree traversal) which allows the tree structure of subcaves.
     'feincms' #This is a little content management app that does the javascript admin page for mptt.

urls.py

@@ -1,10 +1,10 @@
 from django.conf.urls.defaults import *
 import troggle.settings as settings
 
-from expo.views import *  # flat import
-from expo.views_caves import *
-from expo.views_survex import *
-from expo.models import *
+from core.views import *  # flat import
+from core.views_caves import *
+from core.views_survex import *
+from core.models import *
 from django.views.generic.create_update import create_object
 from django.contrib import admin
 from django.views.generic.list_detail import object_list