From 4cdb3f4e6893aa66b84f5cba899340c77378b97c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 16 Mar 2018 12:23:41 +0100 Subject: [PATCH] improved timezone handling of workout edit save form --- rowers/views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rowers/views.py b/rowers/views.py index d5dc92dc..f2ba6f6b 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -8722,7 +8722,14 @@ def workout_edit_view(request,id=0,message="",successmessage=""): startdatetime = (str(date) + ' ' + str(starttime)) startdatetime = datetime.datetime.strptime(startdatetime, "%Y-%m-%d %H:%M:%S") - startdatetime = timezone.make_aware(startdatetime) + + startdatetime = startdatetime.replace(tzinfo=pytz.timezone(thetimezone)) + try: + # aware object can be in any timezone + out = startdatetime.astimezone(pytz.utc) + except (ValueError, TypeError): + startdatetime = timezone.make_aware(startdatetime) + startdatetime = startdatetime.astimezone(pytz.timezone(thetimezone))