|
@@ -142,14 +142,18 @@ class labkeyInterface:
|
|
|
try:
|
|
|
response=self.get(url)
|
|
|
encoding=chardet.detect(response.data)['encoding']
|
|
|
- print(f'Got encoding: {encoding}')
|
|
|
+
|
|
|
jsonData=json.loads(response.data.decode(encoding))
|
|
|
except AttributeError:
|
|
|
print('Failed')
|
|
|
return None
|
|
|
except UnicodeDecodeError:
|
|
|
- encoding='ASCII'
|
|
|
- jsonData=json.loads(response.data.decode(encoding))
|
|
|
+ try:
|
|
|
+ encoding='ASCII'
|
|
|
+ jsonData=json.loads(response.data.decode(encoding))
|
|
|
+ except UnicodeDecodeError:
|
|
|
+ print(response.data)
|
|
|
+ return None
|
|
|
|
|
|
self.cookie=response.getheader('Set-Cookie')
|
|
|
print('User: {} CSRF: {}'.format(jsonData['displayName'],jsonData['CSRF']))
|