replaced mktime with arrow.get

rowers/views.py

@@ -3,6 +3,7 @@ import colorsys
 import timestring
 import zipfile
 import bleach
+import arrow
 import pytz
 import operator
 import warnings
@@ -464,7 +465,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,
 	except:
 	    title = 'Imported'
 
-    starttimeunix = mktime(rowdatetime.utctimetuple())
+    starttimeunix = arrow.get(rowdatetime).timestamp
 
     res = make_cumvalues(0.1*strokedata['t'])
     cum_time = res[0]
@@ -618,9 +619,10 @@ def add_workout_from_runkeeperdata(user,importid,data):
 	    except:
 		rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
 		rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
-    starttimeunix = mktime(rowdatetime.utctimetuple())
+    starttimeunix = arrow.get(rowdatetime).timestamp
+    #starttimeunix = mktime(rowdatetime.utctimetuple())
     starttimeunix += utcoffset*3600
-        
+    
 	
     try:
 	title = data['name']
@@ -670,9 +672,17 @@ def add_workout_from_runkeeperdata(user,importid,data):
     distseries = pd.Series(distance,index=times_distance)
     distseries = distseries.groupby(distseries.index).first()
     latseries = pd.Series(latcoord,index=times_location)
-    latseries = latseries.groupby(latseries.index).first()
+    try:
+        latseries = latseries.groupby(latseries.index).first()
+    except TypeError:
+        latseries = 0.0*distseries
+        
     lonseries = pd.Series(loncoord,index=times_location)
-    lonseries = lonseries.groupby(lonseries.index).first()
+    try:
+        lonseries = lonseries.groupby(lonseries.index).first()
+    except TypeError:
+        lonseries = 0.0*distseries
+        
     spmseries = pd.Series(spm,index=times_spm)
     spmseries = spmseries.groupby(spmseries.index).first()
     hrseries = pd.Series(hr,index=times_hr)
@@ -761,12 +771,8 @@ def add_workout_from_stdata(user,importid,data):
 	comments = data['comments']
     except:
 	comments = ''
-    
-    try:
-	thetimezone = tz(data['timezone'])
-    except:
-	thetimezone = 'UTC'
 
+        
     r = getrower(user)
     try:
 	rowdatetime = iso8601.parse_date(data['start_time'])
@@ -781,9 +787,8 @@ def add_workout_from_stdata(user,importid,data):
 	    except:
 		rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
 		rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
-    starttimeunix = mktime(rowdatetime.utctimetuple())
-        
-	
+    starttimeunix = arrow.get(rowdatetime).timestamp
+
     try:
 	title = data['name']
     except:
@@ -944,7 +949,8 @@ def add_workout_from_underarmourdata(user,importid,data):
 	    except:
 		rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
 		rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
-    starttimeunix = mktime(rowdatetime.utctimetuple())
+    starttimeunix = arrow.get(rowdatetime).timestamp
+    #starttimeunix = mktime(rowdatetime.utctimetuple())
         
 	
     try:
@@ -4782,8 +4788,9 @@ def workout_downloadwind_view(request,id=0,
 	avgtime = int(rowdata.df['TimeStamp (sec)'].mean()-rowdata.df.ix[0,'TimeStamp (sec)'])
 	startdatetime = dateutil.parser.parse("{}, {}".format(row.date,
 							      row.starttime))
-	
-	starttimeunix = int(mktime(startdatetime.utctimetuple()))
+
+        starttimeunix = int(arrow.get(startdatetime).timestamp)
+	#starttimeunix = int(mktime(startdatetime.utctimetuple()))
 	avgtime = starttimeunix+avgtime
 	winddata = get_wind_data(avglat,avglon,avgtime)
 	windspeed = winddata[0]
@@ -4852,7 +4859,8 @@ def workout_downloadmetar_view(request,id=0,
 	startdatetime = dateutil.parser.parse("{}, {}".format(row.date,
 							      row.starttime))
 	
-	starttimeunix = int(mktime(startdatetime.utctimetuple()))
+        starttimeunix = arrow.get(startdatetime).timestamp
+	#starttimeunix = int(mktime(startdatetime.utctimetuple()))
 	avgtime = starttimeunix+avgtime
 	winddata = get_metar_data(airportcode,avgtime)
 	windspeed = winddata[0]