Part one of getting troggle to work with django 1.10

Major rework of how survex is processed
This commit is contained in:
Sam Wenham
2019-07-16 00:07:37 +01:00
parent a26109cb30
commit 08a41941f9
38 changed files with 450 additions and 918 deletions

View File

@@ -121,7 +121,7 @@ def ParseDate(tripdate, year):
day, month, year = int(mdategoof.group(1)), int(mdategoof.group(2)), int(mdategoof.group(4)) + yadd
else:
assert False, tripdate
return datetime.date(year, month, day)
return make_aware(datetime.datetime(year, month, day), get_current_timezone())
# 2006, 2008 - 2010
def Parselogwikitxt(year, expedition, txt):