Merge branch 'release/v18.0.16'

rowers/dataprep.py

@@ -145,7 +145,12 @@ def workout_goldmedalstandard(workout, reset=False):
         goldmedalstandard, goldmedalseconds = calculate_goldmedalstandard(
             workout.user, workout)
         if workout.workouttype in otwtypes:
-            factor = 100./(100.-workout.user.otwslack)
+            try:
+                factor = 100./(100.-workout.user.otwslack)
+            except ZeroDivisionError:
+                factor = 1.
+                workout.user.otwslack = 0
+                workout.user.save()
             goldmedalstandard = goldmedalstandard*factor
         workout.goldmedalstandard = goldmedalstandard
         workout.goldmedalseconds = goldmedalseconds

rowers/integrations/strava.py

@@ -187,15 +187,15 @@ class StravaIntegration(SyncIntegration):
             except KeyError:
                 activity_type = 'Rowing'
 
-            _ = myqueue(queue,
-                        handle_strava_sync,
-                        self.rower.stravatoken,
-                        workout.id,
-                        tcxfile, workout.name, activity_type,
-                        workout.notes)
+        _ = myqueue(queue,
+                    handle_strava_sync,
+                    self.rower.stravatoken,
+                    workout.id,
+                    tcxfile, workout.name, activity_type,
+                    workout.notes)
 
-            dologging('strava_export_log.log', 'Exporting as {t} from {w}'.format(
-                t=activity_type, w=workout.workouttype))
+        dologging('strava_export_log.log', 'Exporting as {t} from {w}'.format(
+            t=activity_type, w=workout.workouttype))
 
         return 1
 

rowers/interactiveplots.py

@@ -5773,14 +5773,13 @@ def interactive_flex_chart2(id, r, promember=0,
             except KeyError:
                 pass
 
-    if len(rowdata) < 2:
-        rowdata = dataprep.getsmallrowdata_db(columns, ids=[id], doclean=True,
-                                              workstrokesonly=False)
-        workstrokesonly = False
-    if len(rowdata) < 2:
-        rowdata = dataprep.getsmallrowdata_db(columns, ids=[id],
-                                              doclean=False,
-                                              workstrokesonly=False)
+    try:
+        if len(rowdata) < 2:
+            rowdata = dataprep.getsmallrowdata_db(columns, ids=[id],
+                                                  doclean=False,
+                                                  workstrokesonly=False)
+            workstrokesonly = False
+    except TypeError:
         workstrokesonly = False
     try:
         _ = rowdata[yparam2]

rowers/weather.py

@@ -38,7 +38,10 @@ def get_weather_data(long, lat, unixtime):
         return 0
 
     if s.ok:
-        return s.json()
+        try:
+            return s.json()
+        except:
+            return 0
     else:  # pragma: no cover
         return 0