summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:49:50 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:49:50 +0100
commitb4d82ddeea4d231d1c5af8b7bba523ece5822364 (patch)
treeac383f1ebb0d8b2e98e0c08358319e8a36f7c687
parent4a50e098a9aa17a4d6eeca85157a84fe76a82383 (diff)
downloadtroggle-b4d82ddeea4d231d1c5af8b7bba523ece5822364.tar.gz
troggle-b4d82ddeea4d231d1c5af8b7bba523ece5822364.tar.bz2
troggle-b4d82ddeea4d231d1c5af8b7bba523ece5822364.zip
[svn] make work
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8236 by julian @ 1/30/2009 5:40 PM
-rw-r--r--parsers/cavetab.py5
-rw-r--r--parsers/survex.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/parsers/cavetab.py b/parsers/cavetab.py
index 3203879..270e6a5 100644
--- a/parsers/cavetab.py
+++ b/parsers/cavetab.py
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
import sys
-import settings
+sys.path.append("/home/mjg/expoweb/troggle")
import expo.models as models
+import settings as settings
import csv
import time
@@ -286,4 +287,4 @@ def GetCaveLookup():
Gcavelookup["hauchhole"] = Gcavelookup["234"]
return Gcavelookup
- \ No newline at end of file
+
diff --git a/parsers/survex.py b/parsers/survex.py
index 017a3ba..93f708e 100644
--- a/parsers/survex.py
+++ b/parsers/survex.py
@@ -84,7 +84,7 @@ def make_model(name, parent, iter_lines, sf, c, l):
survex_block = m,
role = models.Role.objects.get(name = roles[role])).save()
else:
- print "no person", exp, sname, role
+ print ("no person", exp, sname, role)
except AttributeError:
print ("Person not found: " + name + " in " + file_ + " " + role).encode('ascii', 'xmlcharrefreplace')
except AssertionError, inst: