Merge branch 'release/v2.96'

rowers/stravastuff.py

@@ -256,10 +256,14 @@ def createstravaworkoutdata(w):
             s = inF.read()
             with gzip.GzipFile(gzfilename,'wb') as outF:
                 outF.write(s)
-        os.remove(tcxfilename)
+        try:
+            os.remove(tcxfilename)
+        except WindowError:
+            pass
+            
         return gzfilename,""
     except:
-        message = str(sys.exc_info()[0])
+        message = "createstravaworkoutdata "+str(sys.exc_info()[0])
         tcxfilename = 0
 
     return tcxfilename,message