From 08a41941f9e2b35b16548624d5070216dd933f79 Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Tue, 16 Jul 2019 00:07:37 +0100 Subject: Part one of getting troggle to work with django 1.10 Major rework of how survex is processed --- parsers/logbooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'parsers/logbooks.py') diff --git a/parsers/logbooks.py b/parsers/logbooks.py index e5817a6..224b2cd 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -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): -- cgit v1.2.3