Make the logbook parser a little more sane

Move the parser to expo mapping to settings
Set a default parser
Iterate over the expo years rather than the mapping list!

1 files changed, 3 insertions, 3 deletions

diff --git a/parsers/people.py b/parsers/people.py
index bc18472..3c3fc03 100644
--- a/parsers/people.py
+++ b/parsers/people.py
@@ -50,7 +50,7 @@ def LoadPersonsExpos():
     header = dict(zip(headers, range(len(headers))))
     
     # make expeditions
-    print "Loading expeditions"
+    print("Loading expeditions")
     years = headers[5:]
     
     for year in years:
@@ -61,7 +61,7 @@ def LoadPersonsExpos():
 
     
     # make persons
-    print "Loading personexpeditions"
+    print("Loading personexpeditions")
     #expoers2008 = """Edvin Deadman,Kathryn Hopkins,Djuke Veldhuis,Becka Lawson,Julian Todd,Natalie Uomini,Aaron Curtis,Tony Rooke,Ollie Stevens,Frank Tully,Martin Jahnke,Mark Shinwell,Jess Stirrups,Nial Peters,Serena Povia,Olly Madge,Steve Jones,Pete Harley,Eeva Makiranta,Keith Curtis""".split(",")
     #expomissing = set(expoers2008)
 
@@ -127,7 +127,7 @@ def GetPersonExpeditionNameLookup(expedition):
     res = { }
     duplicates = set()
     
-    print "Calculating GetPersonExpeditionNameLookup for", expedition.year
+    print("Calculating GetPersonExpeditionNameLookup for " + expedition.year)
     personexpeditions = models.PersonExpedition.objects.filter(expedition=expedition)
     for personexpedition in personexpeditions:
         possnames = [ ]