Merge branch 'release/v20.3.9'

rowers/interactiveplots.py

@@ -3571,9 +3571,8 @@ def interactive_otwcpchart(powerdf, promember=0, rowername="", r=None,
         title = "Critical Power for "+rowername
     plot.title.text = title
 
-    #xaxis = plot.select(dict(type=Axis, layout="below")) #[0]
+    plot.xaxis[0].formatter = PrintfTickFormatter(format="%5f")
-    #print(xaxis)
+
-    #xaxis.formatter = PrintfTickFormatter()
 
     hover = plot.select(dict(type=HoverTool))
 
@@ -5777,7 +5776,7 @@ def interactive_flex_chart2(id, r, promember=0,
                                                   doclean=False,
                                                   workstrokesonly=False)
             workstrokesonly = False
-    except TypeError: # pragma: no cover
+    except (KeyError, TypeError): # pragma: no cover
         workstrokesonly = False
     try:
         _ = rowdata[yparam2]
@@ -5792,13 +5791,13 @@ def interactive_flex_chart2(id, r, promember=0,
     # test if we have drive energy
     try:
         _ = rowdata['driveenergy'].mean()
-    except KeyError:
+    except (KeyError, TypeError):
         rowdata['driveenergy'] = 500.
 
     # test if we have power
     try:
         _ = rowdata['power'].mean()
-    except KeyError:
+    except (KeyError, TypeError):
         rowdata['power'] = 50.
 
     # replace nans

rowers/models.py

@@ -3688,9 +3688,9 @@ def create_or_update_syncrecord(rower, workout, **kwargs):
 
     if workout:
         records = SyncRecord.objects.filter(workout=workout,rower=rower)
-        if records.count():
+        try:
             record = records[0]
-        else:
+        except IndexError:
             records = SyncRecord.objects.filter(**kwargs,rower=rower)
             if records.count():
                 record = records[0]

rowers/tasks.py

@@ -781,7 +781,7 @@ def handle_strava_sync(stravatoken,
                     if 'LatLon' in tb:
                         dologging('strava_fail.log', 'Trying temporary fix')
                         failed = False
-            except (ActivityUploadFailed, stravalib.exc.RateLimitExceeded):  # pragma: no cover
+            except (ActivityUploadFailed, stravalib.exc.RateLimitExceeded, JSONDecodeError):  # pragma: no cover
                 dologging(
                     'strava_fail.log', 'Strava upload failed for Workout {id}'.format(id=workoutid))
                 tb = traceback.format_exc()
@@ -3276,6 +3276,7 @@ def handle_rp3_async_workout(userid, rp3token, rp3id, startdatetime, max_attempt
 
     waittime = 3
     while not have_link:
+        try:
             response = requests.post(
                 url=graphql_url,
                 headers=headers,
@@ -3286,7 +3287,6 @@ def handle_rp3_async_workout(userid, rp3token, rp3id, startdatetime, max_attempt
             if response.status_code != 200:  # pragma: no cover
                 have_link = True
 
-        try:
             workout_download_details = pd.json_normalize(
                 response.json()['data']['download'])
             dologging('rp3_import.log', response.json())