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

Merge pull request #313 from fredj/requests_json

Browse source 
[module/weather] Use json function from requests response
This commit is contained in:
tobi-wan-kenobi 2018-10-31 17:26:05 +01:00 committed by GitHub
commit 316dde0dbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bumblebee/modules/weather.py
View file

@ -16,7 +16,7 @@ import bumblebee.input
import bumblebee.output import bumblebee.output
import bumblebee.engine import bumblebee.engine
import re import re
import json
try: try:
import requests import requests
from requests.exceptions import RequestException from requests.exceptions import RequestException
@ -84,13 +84,13 @@ class Module(bumblebee.engine.Module):
weather_url = "{}&units={}".format(weather_url, self._unit) weather_url = "{}&units={}".format(weather_url, self._unit)
if self._location == "auto": if self._location == "auto":
location_url = "http://ipinfo.io/json" location_url = "http://ipinfo.io/json"
location = json.loads(requests.get(location_url).text) location = requests.get(location_url).json()
coord = location["loc"].split(",") coord = location["loc"].split(",")
self._city = location["city"] self._city = location["city"]
weather_url = "{url}&lat={lat}&lon={lon}".format(url=weather_url, lat=coord[0], lon=coord[1]) weather_url = "{url}&lat={lat}&lon={lon}".format(url=weather_url, lat=coord[0], lon=coord[1])
else: else:
weather_url = "{url}&q={city}".format(url=weather_url, city=self._location) weather_url = "{url}&q={city}".format(url=weather_url, city=self._location)
weather = json.loads(requests.get(weather_url).text) weather = requests.get(weather_url).json()
self._temperature = int(weather['main']['temp']) self._temperature = int(weather['main']['temp'])
self._weather = weather['weather'][0]['main'].lower() self._weather = weather['weather'][0]['main'].lower()
self._valid = True self._valid = True