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

Fixed up linting errors

Browse Source
This commit is contained in:
jamespcole 2015-03-09 01:14:44 +11:00
parent dc8147c46d
commit 42dc973ccc
3 changed files with 105 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
homeassistant/components/light/vera.py
View File

@ -2,10 +2,12 @@
Support for Vera lights. Support for Vera lights.
Configuration: Configuration:
This component is useful if you wish for switches connected to your Vera controller to appear as lights This component is useful if you wish for switches connected to your Vera
in homeassistant. All switches will be added as a light unless you exclude them in the config. controller to appear as lights in homeassistant. All switches will be added
as a light unless you exclude them in the config.
To use the Vera lights you will need to add something like the following to your config/configuration.yaml To use the Vera lights you will need to add something like the following to
your config/configuration.yaml
light: light:
platform: vera platform: vera
@ -23,14 +25,16 @@ VARIABLES:
vera_controller_url vera_controller_url
*Required *Required
This is the base URL of your vera controller including the port number if not running on 80 This is the base URL of your vera controller including the port number if not
running on 80
Example: http://192.168.1.21:3480/ Example: http://192.168.1.21:3480/
device_data device_data
*Optional *Optional
This contains an array additional device info for your Vera devices. It is not required and if This contains an array additional device info for your Vera devices. It is not
not specified all sensors configured in your Vera controller will be added with default values. required and if not specified all lights configured in your Vera controller
will be added with default values.
These are the variables for the device_data array: These are the variables for the device_data array:
@ -42,35 +46,34 @@ The Vera device id you wish these configuration options to be applied to
name name
*Optional *Optional
This parameter allows you to override the name of your Vera device in the HA interface, if not specified the This parameter allows you to override the name of your Vera device in the HA
value configured for the device in your Vera will be used interface, if not specified the value configured for the device in your Vera
will be used
exclude exclude
*Optional *Optional
This parameter allows you to exclude the specified device from homeassistant, it should be set to "true" if This parameter allows you to exclude the specified device from homeassistant,
you want this device excluded it should be set to "true" if you want this device excluded
""" """
import logging import logging
import requests
import time import time
import json
from homeassistant.helpers import ToggleDevice from homeassistant.helpers import ToggleDevice
# pylint: disable=no-name-in-module, import-error
import homeassistant.external.vera.vera as veraApi import homeassistant.external.vera.vera as veraApi
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
# pylint: disable=unused-argument
def setup_platform(hass, config, add_devices_callback, discovery_info=None): def setup_platform(hass, config, add_devices_callback, discovery_info=None):
""" Find and return Vera lights. """ """ Find and return Vera lights. """
try: try:
base_url = config.get('vera_controller_url') base_url = config.get('vera_controller_url')
if not base_url: if not base_url:
_LOGGER.error("The required parameter 'vera_controller_url' was not found in config") _LOGGER.error("The required parameter 'vera_controller_url'"
" was not found in config")
return False return False
device_data = config.get('device_data', None) device_data = config.get('device_data', None)
@ -89,12 +92,14 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
lights.append(VeraLight(device, extra_data)) lights.append(VeraLight(device, extra_data))
add_devices_callback(lights) add_devices_callback(lights)
# pylint: disable=broad-except
except Exception as inst: except Exception as inst:
_LOGGER.error("Could not find Vera lights: %s", inst) _LOGGER.error("Could not find Vera lights: %s", inst)
return False return False
def get_extra_device_data(device_data, device_id): def get_extra_device_data(device_data, device_id):
""" Gets the additional configuration data by Vera device Id """
if not device_data: if not device_data:
return None return None
@ -136,9 +141,11 @@ class VeraLight(ToggleDevice):
attr['Armed'] = 'True' if armed == '1' else 'False' attr['Armed'] = 'True' if armed == '1' else 'False'
if self.vera_device.is_trippable: if self.vera_device.is_trippable:
lastTripped = self.vera_device.refresh_value('LastTrip') last_tripped = self.vera_device.refresh_value('LastTrip')
tripTimeStr = time.strftime("%Y-%m-%d %H:%M", time.localtime(int(lastTripped))) trip_time_str = time.strftime("%Y-%m-%d %H:%M",
attr['Last Tripped'] = tripTimeStr time.localtime(int(last_tripped)))
attr['Last Tripped'] = trip_time_str
tripped = self.vera_device.refresh_value('Tripped') tripped = self.vera_device.refresh_value('Tripped')
attr['Tripped'] = 'True' if tripped == '1' else 'False' attr['Tripped'] = 'True' if tripped == '1' else 'False'

58
homeassistant/components/sensor/vera.py
View File

@ -2,7 +2,8 @@
Support for Vera sensors. Support for Vera sensors.
Configuration: Configuration:
To use the Vera sensors you will need to add something like the following to your config/configuration.yaml To use the Vera sensors you will need to add something like the following to
your config/configuration.yaml
sensor: sensor:
platform: vera platform: vera
@ -20,14 +21,16 @@ VARIABLES:
vera_controller_url vera_controller_url
*Required *Required
This is the base URL of your vera controller including the port number if not running on 80 This is the base URL of your vera controller including the port number if not
running on 80
Example: http://192.168.1.21:3480/ Example: http://192.168.1.21:3480/
device_data device_data
*Optional *Optional
This contains an array additional device info for your Vera devices. It is not required and if This contains an array additional device info for your Vera devices. It is not
not specified all sensors configured in your Vera controller will be added with default values. required and if not specified all sensors configured in your Vera controller
will be added with default values.
These are the variables for the device_data array: These are the variables for the device_data array:
@ -39,44 +42,41 @@ The Vera device id you wish these configuration options to be applied to
name name
*Optional *Optional
This parameter allows you to override the name of your Vera device in the HA interface, if not specified the This parameter allows you to override the name of your Vera device in the HA
value configured for the device in your Vera will be used interface, if not specified the value configured for the device in your Vera
will be used
exclude exclude
*Optional *Optional
This parameter allows you to exclude the specified device from homeassistant, it should be set to "true" if This parameter allows you to exclude the specified device from homeassistant,
you want this device excluded it should be set to "true" if you want this device excluded
""" """
import logging import logging
import requests
import time import time
import json
from homeassistant.helpers import Device from homeassistant.helpers import Device
# pylint: disable=no-name-in-module, import-error
import homeassistant.external.vera.vera as veraApi import homeassistant.external.vera.vera as veraApi
from homeassistant.const import (STATE_OPEN, STATE_CLOSED, ATTR_FRIENDLY_NAME)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
vera_controller = None # pylint: disable=unused-argument
vera_sensors = []
def get_devices(hass, config): def get_devices(hass, config):
""" Find and return Vera Sensors. """ """ Find and return Vera Sensors. """
try: try:
base_url = config.get('vera_controller_url') base_url = config.get('vera_controller_url')
if not base_url: if not base_url:
_LOGGER.error("The required parameter 'vera_controller_url' was not found in config") _LOGGER.error("The required parameter 'vera_controller_url'"
" was not found in config")
return False return False
device_data = config.get('device_data', None) device_data = config.get('device_data', None)
vera_controller = veraApi.VeraController(base_url) vera_controller = veraApi.VeraController(base_url)
devices = vera_controller.get_devices(['Temperature Sensor', 'Light Sensor', 'Sensor']) categories = ['Temperature Sensor', 'Light Sensor', 'Sensor']
devices = vera_controller.get_devices(categories)
vera_sensors = [] vera_sensors = []
for device in devices: for device in devices:
@ -87,16 +87,18 @@ def get_devices(hass, config):
if exclude is not True: if exclude is not True:
vera_sensors.append(VeraSensor(device, extra_data)) vera_sensors.append(VeraSensor(device, extra_data))
# pylint: disable=broad-except
except Exception as inst: except Exception as inst:
_LOGGER.error("Could not find Vera sensors: %s", inst) _LOGGER.error("Could not find Vera sensors: %s", inst)
return vera_sensors return vera_sensors
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
""" Performs setup for Vera controller devices """
add_devices(get_devices(hass, config)) add_devices(get_devices(hass, config))
def get_extra_device_data(device_data, device_id): def get_extra_device_data(device_data, device_id):
""" Gets the additional configuration data by Vera device Id """
if not device_data: if not device_data:
return None return None
@ -116,15 +118,12 @@ class VeraSensor(Device):
self.extra_data = extra_data self.extra_data = extra_data
def __str__(self): def __str__(self):
return "%s %s %s" % (self.name(), self.deviceId(), self.state()) return "%s %s %s" % (self.name, self.vera_device.deviceId, self.state)
@property @property
def state(self): def state(self):
return self.current_value return self.current_value
def updateState(self):
return self.state()
@property @property
def name(self): def name(self):
""" Get the mame of the sensor. """ """ Get the mame of the sensor. """
@ -144,9 +143,11 @@ class VeraSensor(Device):
attr['Armed'] = 'True' if armed == '1' else 'False' attr['Armed'] = 'True' if armed == '1' else 'False'
if self.vera_device.is_trippable: if self.vera_device.is_trippable:
lastTripped = self.vera_device.refresh_value('LastTrip') last_tripped = self.vera_device.refresh_value('LastTrip')
tripTimeStr = time.strftime("%Y-%m-%d %H:%M", time.localtime(int(lastTripped))) trip_time_str = time.strftime("%Y-%m-%d %H:%M",
attr['Last Tripped'] = tripTimeStr time.localtime(int(last_tripped)))
attr['Last Tripped'] = trip_time_str
tripped = self.vera_device.refresh_value('Tripped') tripped = self.vera_device.refresh_value('Tripped')
attr['Tripped'] = 'True' if tripped == '1' else 'False' attr['Tripped'] = 'True' if tripped == '1' else 'False'
@ -159,7 +160,10 @@ class VeraSensor(Device):
def update(self): def update(self):
if self.vera_device.category == "Temperature Sensor": if self.vera_device.category == "Temperature Sensor":
self.vera_device.refresh_value('CurrentTemperature') self.vera_device.refresh_value('CurrentTemperature')
self.current_value = self.vera_device.get_value('CurrentTemperature') + '°' + self.vera_device.veraController.temperature_units current_temp = self.vera_device.get_value('CurrentTemperature')
vera_temp_units = self.vera_device.veraController.temperature_units
self.current_value = current_temp + '°' + vera_temp_units
elif self.vera_device.category == "Light Sensor": elif self.vera_device.category == "Light Sensor":
self.vera_device.refresh_value('CurrentLevel') self.vera_device.refresh_value('CurrentLevel')
self.current_value = self.vera_device.get_value('CurrentLevel') self.current_value = self.vera_device.get_value('CurrentLevel')

44
homeassistant/components/switch/vera.py
View File

@ -2,7 +2,8 @@
Support for Vera switches. Support for Vera switches.
Configuration: Configuration:
To use the Vera switches you will need to add something like the following to your config/configuration.yaml To use the Vera lights you will need to add something like the following to
your config/configuration.yaml
switch: switch:
platform: vera platform: vera
@ -20,14 +21,16 @@ VARIABLES:
vera_controller_url vera_controller_url
*Required *Required
This is the base URL of your vera controller including the port number if not running on 80 This is the base URL of your vera controller including the port number if not
running on 80
Example: http://192.168.1.21:3480/ Example: http://192.168.1.21:3480/
device_data device_data
*Optional *Optional
This contains an array additional device info for your Vera devices. It is not required and if This contains an array additional device info for your Vera devices. It is not
not specified all switches configured in your Vera controller will be added with default values. required and if not specified all lights configured in your Vera controller
will be added with default values.
These are the variables for the device_data array: These are the variables for the device_data array:
@ -39,37 +42,34 @@ The Vera device id you wish these configuration options to be applied to
name name
*Optional *Optional
This parameter allows you to override the name of your Vera device in the HA interface, if not specified the This parameter allows you to override the name of your Vera device in the HA
value configured for the device in your Vera will be used interface, if not specified the value configured for the device in your Vera
will be used
exclude exclude
*Optional *Optional
This parameter allows you to exclude the specified device from homeassistant, it should be set to "true" if This parameter allows you to exclude the specified device from homeassistant,
you want this device excluded it should be set to "true" if you want this device excluded
""" """
import logging import logging
import requests
import time import time
import json
from homeassistant.helpers import ToggleDevice from homeassistant.helpers import ToggleDevice
# pylint: disable=no-name-in-module, import-error
import homeassistant.external.vera.vera as veraApi import homeassistant.external.vera.vera as veraApi
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
vera_controller = None # pylint: disable=unused-argument
vera_switches = []
def get_devices(hass, config): def get_devices(hass, config):
""" Find and return Vera switches. """ """ Find and return Vera switches. """
try: try:
base_url = config.get('vera_controller_url') base_url = config.get('vera_controller_url')
if not base_url: if not base_url:
_LOGGER.error("The required parameter 'vera_controller_url' was not found in config") _LOGGER.error("The required parameter 'vera_controller_url'"
" was not found in config")
return False return False
device_data = config.get('device_data', None) device_data = config.get('device_data', None)
@ -87,6 +87,7 @@ def get_devices(hass, config):
if exclude is not True: if exclude is not True:
vera_switches.append(VeraSwitch(device, extra_data)) vera_switches.append(VeraSwitch(device, extra_data))
# pylint: disable=broad-except
except Exception as inst: except Exception as inst:
_LOGGER.error("Could not find Vera switches: %s", inst) _LOGGER.error("Could not find Vera switches: %s", inst)
return False return False
@ -94,6 +95,7 @@ def get_devices(hass, config):
return vera_switches return vera_switches
def get_extra_device_data(device_data, device_id): def get_extra_device_data(device_data, device_id):
""" Gets the additional configuration data by Vera device Id """
if not device_data: if not device_data:
return None return None
@ -104,6 +106,7 @@ def get_extra_device_data(device_data, device_id):
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
""" Find and return Vera lights. """
add_devices(get_devices(hass, config)) add_devices(get_devices(hass, config))
class VeraSwitch(ToggleDevice): class VeraSwitch(ToggleDevice):
@ -136,9 +139,11 @@ class VeraSwitch(ToggleDevice):
attr['Armed'] = 'True' if armed == '1' else 'False' attr['Armed'] = 'True' if armed == '1' else 'False'
if self.vera_device.is_trippable: if self.vera_device.is_trippable:
lastTripped = self.vera_device.refresh_value('LastTrip') last_tripped = self.vera_device.refresh_value('LastTrip')
tripTimeStr = time.strftime("%Y-%m-%d %H:%M", time.localtime(int(lastTripped))) trip_time_str = time.strftime("%Y-%m-%d %H:%M",
attr['Last Tripped'] = tripTimeStr time.localtime(int(last_tripped)))
attr['Last Tripped'] = trip_time_str
tripped = self.vera_device.refresh_value('Tripped') tripped = self.vera_device.refresh_value('Tripped')
attr['Tripped'] = 'True' if tripped == '1' else 'False' attr['Tripped'] = 'True' if tripped == '1' else 'False'
@ -157,7 +162,6 @@ class VeraSwitch(ToggleDevice):
self.vera_device.switch_off() self.vera_device.switch_off()
self.is_on_status = False self.is_on_status = False
@property @property
def is_on(self): def is_on(self):
""" True if device is on. """ """ True if device is on. """