Merge branch 'release/v18.1.6'

rowers/polarstuff.py

@@ -271,7 +271,7 @@ def get_polar_workouts(user):
                         dologging('polar.log',str(exercise_dict))
 
             # commit transaction
-            requests.put(url, headers=headers)
+            #requests.put(url, headers=headers)
 
     return exercise_list # pragma: no cover
 

rowers/utils.py

@@ -134,7 +134,10 @@ def dologging(filename,s):
         f.write('\n')
         f.write(timestamp)
         f.write(' ')
-        f.write(s)
+        try:
+            f.write(s)
+        except TypeError:
+            f.write(str(s))
 
 def to_pace(pace): # pragma: no cover
     minutes, seconds = divmod(pace,60)

rowers/views/importviews.py

@@ -1331,6 +1331,7 @@ def workout_polarimport_view(request,userid=0): # pragma: no cover
         url = reverse('workouts_view')
         return HttpResponseRedirect(url)
     except: # pragma: no cover
+        exercises = []
         pass
 
     for exercise in exercises: