jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-26 02:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev'

Browse Source
This commit is contained in:
Ryan Kraus 2015-04-25 14:49:02 -04:00
commit 97bb5bcb7d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/__init__.py
View File

@ -907,7 +907,8 @@ class Config(object):
_LOGGER.info('Auto detecting location and temperature unit') _LOGGER.info('Auto detecting location and temperature unit')
try: try:
info = requests.get('https://freegeoip.net/json/').json() info = requests.get(
'https://freegeoip.net/json/', timeout=5).json()
except requests.RequestException: except requests.RequestException:
return return

10
homeassistant/components/isy994.py
View File

@ -6,9 +6,6 @@ devices. Also contains the base classes for ISY Sensors, Lights, and Switches.
import logging import logging
from urllib.parse import urlparse from urllib.parse import urlparse
# addon library imports
import PyISY
# homeassistant imports # homeassistant imports
from homeassistant import bootstrap from homeassistant import bootstrap
from homeassistant.loader import get_component from homeassistant.loader import get_component
@ -38,6 +35,13 @@ def setup(hass, config):
Setup isy994 component. Setup isy994 component.
This will automatically import associated lights, switches, and sensors. This will automatically import associated lights, switches, and sensors.
""" """
try:
import PyISY
except ImportError:
_LOGGER.error("Error while importing dependency PyISY.")
return False
# pylint: disable=global-statement # pylint: disable=global-statement
# check for required values in configuration file # check for required values in configuration file
if not validate_config(config, if not validate_config(config,