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

Ported codebase to Python 3. Long Live Python 3!

Browse source
This commit is contained in:
Paulus Schoutsen 2014-04-14 00:10:24 -07:00
parent 8fdf2d608a
commit 7e06d535ab
14 changed files with 105 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

14
homeassistant/bootstrap.py
View file

@ -3,7 +3,7 @@ Provides methods to bootstrap a home assistant instance.
"""
import importlib
import ConfigParser
import configparser
import logging
import homeassistant as ha
@ -33,7 +33,7 @@ def from_config_file(config_path):
statusses = []
# Read config
config = ConfigParser.SafeConfigParser()
config = configparser.SafeConfigParser()
config.read(config_path)
# Init core
@ -51,7 +51,7 @@ def from_config_file(config_path):
""" Failure proof option retriever. """
try:
return config.get(section, option)
except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
except (configparser.NoSectionError, configparser.NoOptionError):
return default
# Device scanner
@ -83,7 +83,7 @@ def from_config_file(config_path):
get_opt('device_tracker.netgear', 'username'),
get_opt('device_tracker.netgear', 'password'))
except ConfigParser.NoOptionError:
except configparser.NoOptionError:
# If one of the options didn't exist
logger.exception(("Error initializing {}DeviceScanner, "
"could not find one of the following config "
@ -142,7 +142,11 @@ def from_config_file(config_path):
add_status("Light - Hue", light_control.success_init)
light.setup(bus, statemachine, light_control)
if light_control.success_init:
light.setup(bus, statemachine, light_control)
else:
light_control = None
else:
light_control = None