From 4852e36e313959723c9046f14a4150cf8b41524d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 18 May 2018 12:58:21 +0200 Subject: [PATCH] fixed time zone stuff --- rowers/views.py | 16 ++++++++++------ rowers/weather.py | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index 68da142a..565bd793 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -7091,7 +7091,7 @@ def workout_downloadmetar_view(request,id=0, starttimeunix = arrow.get(row.startdatetime).timestamp #starttimeunix = int(mktime(startdatetime.utctimetuple())) - avgtime = starttimeunix+avgtime + avgtime = starttimeunix +avgtime winddata = get_metar_data(airportcode,avgtime) windspeed = winddata[0] windbearing = winddata[1] @@ -9076,12 +9076,16 @@ def workout_edit_view(request,id=0,message="",successmessage=""): rankingpiece = form.cleaned_data['rankingpiece'] except KeyError: rankingpiece =- Workout.objects.get(id=id).rankingpiece - - startdatetime = (str(date) + ' ' + str(starttime)) - startdatetime = datetime.datetime.strptime(startdatetime, - "%Y-%m-%d %H:%M:%S") - startdatetime = startdatetime.replace(tzinfo=pytz.timezone(thetimezone)) + startdatetime = datetime.datetime.combine( + date,starttime + ) + + startdatetime = pytz.timezone(thetimezone).localize( + startdatetime + ) + + print startdatetime try: # aware object can be in any timezone out = startdatetime.astimezone(pytz.utc) diff --git a/rowers/weather.py b/rowers/weather.py index 8f5ba3f5..9e08627f 100644 --- a/rowers/weather.py +++ b/rowers/weather.py @@ -45,6 +45,7 @@ def get_metar_data(airportcode,unixtime): url += str(unixtime+3600) url += "&stationString="+airportcode + try: s = requests.get(url) except: