Merge tag 'v7.25' into develop

bug fix

rowers/imports.py

@@ -78,12 +78,12 @@ def imports_open(user,oauth_data):
     token = getattr(r,oauth_data['tokenname'])
     try:
         refreshtoken = getattr(r,oauth_data['refreshtokenname'])
-    except (AttributeError,KeyError):
+    except (TypeError,AttributeError,KeyError):
         refreshtoken = None
 
     try:
         tokenexpirydate = getattr(r,oauth_data['expirydatename'])
-    except (AttributeError,KeyError):
+    except (TypeError,AttributeError,KeyError):
         tokenexpirydate = None
 
     if (token == '') or (token is None):
@@ -242,8 +242,10 @@ def imports_token_refresh(user,tokenname,refreshtokenname,expirydatename):
     expirydatetime = timezone.now()+timedelta(seconds=expires_in)
 
     setattr(r,tokenname,access_token)
-    setattr(r,expirydatename,expirydatetime)
-    setattr(r,refreshtokenname,refresh_token)
+    if expirydatename is not None:
+        setattr(r,expirydatename,expirydatetime)
+    if refreshtokenname is not None:
+        setattr(r,refreshtokenname,refresh_token)
 
     r.save()
     return r.sporttrackstoken

rowers/runkeeperstuff.py

@@ -15,6 +15,8 @@ oauth_data = {
     'autorization_uri': "https://www.runkeeper.com/opps/authorize",
     'content_type': 'application/x-www-form-urlencoded',
     'tokenname': 'runkeepertoken',
+    'refreshtokenname': None,
+    'expirydatename': None,
     'bearer_auth': True,
     'base_url': "https://runkeeper.com/apps/token",
     }