Merge tag 'v1.24' into develop

v1.24
2017-02-25 20:02:52 +01:00
parent 4b76a30271 54728c1db3
commit 0bdec7fa86
1 changed files with 4 additions and 1 deletions
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -354,7 +354,10 @@ def get_token(code):
    try:
        status_code = token_json['status_code']
    except KeyError:
-        status_code = token_json.status_code
+        try:
+            status_code = token_json.status_code
+        except AttributeError:
+            return (0,'Attribute Error on c2_get_token')

    if status_code == 200:
        thetoken = token_json['access_token']