Merge branch 'hotfix/v10.02'

2019-06-26 12:10:20 +02:00
parent 112101f048 860f1e50f5
commit 9e3aeaef8a
2 changed files with 5 additions and 2 deletions
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -696,8 +696,11 @@ def get_userid(access_token):
               'Content-Type': 'application/json'}
    import urllib
    url = "https://log.concept2.com/api/users/me"
-    response = requests.get(url,headers=headers)
-    
+    try:
+        response = requests.get(url,headers=headers)
+    except:
+        return 0
+        

    me_json = response.json()
    try:
--- a/rowers/tests/testdata/testdata.csv.gz
+++ b/rowers/tests/testdata/testdata.csv.gz