From a5639e734fa32f4f00550dbdf43686a573095c84 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 4 Sep 2017 12:52:13 +0200 Subject: [PATCH] timezone aware bug fixes --- rowers/dataprep.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 0aa9cb97..1337e3a6 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -585,15 +585,19 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower', if timezone_str == None: timezone_str = tf.closest_timezone_at(lng=lonavg, lat=latavg) + if timezone_str == None: + timezone_str = 'UTC' + try: workoutstartdatetime = pytz.timezone(timezone_str).localize( row.rowdatetime ) - - - except ValueError,KeyError: - workoutstartdatetime = thetimezone.localize( - row.rowdatetime - ).astimezone(utc) + except ValueError: + workoutstartdatetime = workoutstartdatetime.astimezone( + pytz.timezone(timezone_str) + ) + except KeyError: + timezone_str = 'UTC' + workoutdate = workoutstartdatetime.astimezone(