fixed time zone stuff

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)

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: