evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1417 from fabaff/freegeoip

Browse source 
Catch 503 responses by freegeoip.net (Fixes #1378)
This commit is contained in:
Paulus Schoutsen 2016-02-27 16:12:47 -08:00
commit 4e750a4d72
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
homeassistant/util/location.py
View file

@ -1,7 +1,4 @@
""" """
homeassistant.util.location
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Module with location helpers. Module with location helpers.
detect_location_info and elevation are mocked by default during tests. detect_location_info and elevation are mocked by default during tests.
@ -26,8 +23,8 @@ def detect_location_info():
try: try:
raw_info = requests.get( raw_info = requests.get(
'https://freegeoip.net/json/', timeout=5).json() 'https://freegeoip.net/json/', timeout=5).json()
except requests.RequestException: except (requests.RequestException, ValueError):
return return None
data = {key: raw_info.get(key) for key in LocationInfo._fields} data = {key: raw_info.get(key) for key in LocationInfo._fields}