Merge tag 'v2.5' into develop

trainingpeaks, watermark, upload page

rowers/tpstuff.py

@@ -8,6 +8,7 @@ import requests.auth
 import json
 from django.utils import timezone
 from datetime import datetime
+from datetime import timedelta
 import numpy as np
 from dateutil import parser
 import time
@@ -101,11 +102,11 @@ def tp_open(user):
 	raise TPNoTokenError("User has no token")
     else:
 	if (timezone.now()>r.tptokenexpirydate):
-	    res = tpstuff.do_refresh_token(r.tprefreshtoken)
+	    res = do_refresh_token(r.tprefreshtoken)
             if res[0] != 0:
                 r.tptoken = res[0]
                 r.tprefreshtoken = res[2]
-                expirydatetime = timezone.now()+datetime.timedelta(seconds=res[1])
+                expirydatetime = timezone.now()+timedelta(seconds=res[1])
                 r.tptokenexpirydate = expirydatetime
                 r.save()
                 thetoken = r.tptoken