Merge tag 'v1.29' into develop

v1.29
2017-02-26 20:10:17 +01:00
parent a8d2827fd7 4889043b96
commit 0ee6aa67d0
1 changed files with 5 additions and 2 deletions
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -363,8 +363,11 @@ def get_token(code):
    token_json = response.json()

    try:
-        status_code = token_json['status_code']
-    except KeyError:
+        status_code = response.status_code
+        # status_code = token_json['status_code']
+    except AttributeError:
+    # except KeyError:
+        return (0,response.text)
        try:
            status_code = token_json.status_code
        except AttributeError: