Merge branch 'release/v13.90' into master
This commit is contained in:
@@ -195,7 +195,7 @@ def handle_strava_sync(stravatoken,workoutid,filename,name,activity_type,descrip
|
|||||||
except JSONDecodeError:
|
except JSONDecodeError:
|
||||||
failed = True
|
failed = True
|
||||||
except stravalib.exc.ObjectNotFound:
|
except stravalib.exc.ObjectNotFound:
|
||||||
failed = true
|
failed = True
|
||||||
if not failed:
|
if not failed:
|
||||||
try:
|
try:
|
||||||
act = client.update_activity(res.id,activity_type=activity_type,
|
act = client.update_activity(res.id,activity_type=activity_type,
|
||||||
@@ -2757,7 +2757,10 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu
|
|||||||
f.write(authorizationstring)
|
f.write(authorizationstring)
|
||||||
f.write(' ')
|
f.write(' ')
|
||||||
f.write('handle_get_strava_file response code {code}\n'.format(code=response.status_code))
|
f.write('handle_get_strava_file response code {code}\n'.format(code=response.status_code))
|
||||||
f.write('Response json {json}\n'.format(json=response.json()))
|
try:
|
||||||
|
f.write('Response json {json}\n'.format(json=response.json()))
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
@@ -2837,7 +2840,7 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
strokelength = velo*60./(spm)
|
strokelength = velo2*60./(spm)
|
||||||
strokelength[np.isinf(strokelength)] = 0.0
|
strokelength[np.isinf(strokelength)] = 0.0
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user