masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch exceptions thrown when calling API

Browse Source
This commit is contained in:
Facetoe 2016-08-10 20:51:38 +08:00
parent 3b06134aab
commit 6160f83045
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
i3pystatus/github.py
View File

@ -1,8 +1,11 @@
from i3pystatus import IntervalModule
import requests
import json import json
import requests
from i3pystatus import IntervalModule
from i3pystatus import logger
from i3pystatus.core import ConfigError from i3pystatus.core import ConfigError
from i3pystatus.core.util import user_open, internet, require from i3pystatus.core.util import user_open, internet, require
from requests import Timeout, ConnectionError
class Github(IntervalModule): class Github(IntervalModule):
@ -51,19 +54,23 @@ class Github(IntervalModule):
@require(internet) @require(internet)
def run(self): def run(self):
format_values = dict(unread_count='', unread='')
if self.access_token: try:
response = requests.get('https://api.github.com/notifications?access_token=' + self.access_token) if self.access_token:
else: response = requests.get('https://api.github.com/notifications?access_token=' + self.access_token)
response = requests.get('https://api.github.com/notifications', auth=(self.username, self.password)) else:
data = json.loads(response.text) response = requests.get('https://api.github.com/notifications', auth=(self.username, self.password))
data = json.loads(response.text)
except (ConnectionError, Timeout) as e:
logger.warn(e)
data = []
# Bad credentials # Bad credentials
if isinstance(data, dict): if isinstance(data, dict):
err_msg = data['message'] err_msg = data['message']
raise ConfigError(err_msg) raise ConfigError(err_msg)
format_values = dict(unread_count='', unread='')
unread = len(data) unread = len(data)
if unread > 0: if unread > 0:
format_values['unread_count'] = unread format_values['unread_count'] = unread