l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/spaceapi] Python2.7 compatability

Browse source
This commit is contained in:
Tobias Manske 2019-01-07 01:10:06 +01:00
parent 54024f1ddd
commit ab309f873b
No known key found for this signature in database
GPG key ID: 978D99F12D4E041F
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bumblebee/modules/spaceapi.py
View file

@ -1,3 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# pylint: disable=C0111,R0903 # pylint: disable=C0111,R0903
"""Displays the state of a spaceapi endpoint """Displays the state of a spaceapi endpoint
@ -18,10 +21,10 @@ import bumblebee.engine
import requests import requests
import threading import threading
import re import re
from json.decoder import JSONDecodeError import json
def formatStringBuilder(s: str, json: dict) -> str: def formatStringBuilder(s, json):
""" """
This function seems to be in dire need of some explanation so here it is: This function seems to be in dire need of some explanation so here it is:
It basically searches the format string for strings of the pattern It basically searches the format string for strings of the pattern
@ -70,7 +73,7 @@ class Module(bumblebee.engine.Module):
# The URL representing the api endpoint # The URL representing the api endpoint
self._url = self.parameter("url", default="http://club.entropia.de/spaceapi") self._url = self.parameter("url", default="http://club.entropia.de/spaceapi")
self._format = self.parameter( self._format = self.parameter(
"format", default="%%space%%: %%state.open%Open%Closed%%" "format", default=u"%%space%%: %%state.open%Open%Closed%%"
) )
def state(self, widget): def state(self, widget):
@ -106,13 +109,15 @@ class Module(bumblebee.engine.Module):
def get_api_async(self): def get_api_async(self):
try: try:
with requests.get(self._url, timeout=10) as request: with requests.get(self._url, timeout=10) as request:
self._data = request.json() # Can't implement error handling for python2.7 if I use
# request.json() as it uses simplejson in newer versions
self._data = json.loads(request.text)
self._error = None self._error = None
except requests.exceptions.Timeout: except requests.exceptions.Timeout:
self._error = "Timeout" self._error = "Timeout"
except requests.exceptions.HTTPError: except requests.exceptions.HTTPError:
self._error = "HTTP Error" self._error = "HTTP Error"
except JSONDecodeError: except ValueError:
self._error = "Not a JSON response" self._error = "Not a JSON response"
# left_mouse_button handler # left_mouse_button handler