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

Migrate to voluptuous (#2990)

Browse Source 
🐬
This commit is contained in:
Fabian Affolter 2016-08-26 22:50:32 +02:00 committed by Teagan Glenn
parent ead0559661
commit 5cc672ea59
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/components/camera/bloomsky.py
View File

@ -11,15 +11,15 @@ import requests
from homeassistant.components.camera import Camera from homeassistant.components.camera import Camera
from homeassistant.loader import get_component from homeassistant.loader import get_component
DEPENDENCIES = ["bloomsky"] DEPENDENCIES = ['bloomsky']
# pylint: disable=unused-argument # pylint: disable=unused-argument
def setup_platform(hass, config, add_devices_callback, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup access to BloomSky cameras.""" """Setup access to BloomSky cameras."""
bloomsky = get_component('bloomsky') bloomsky = get_component('bloomsky')
for device in bloomsky.BLOOMSKY.devices.values(): for device in bloomsky.BLOOMSKY.devices.values():
add_devices_callback([BloomSkyCamera(bloomsky.BLOOMSKY, device)]) add_devices([BloomSkyCamera(bloomsky.BLOOMSKY, device)])
class BloomSkyCamera(Camera): class BloomSkyCamera(Camera):
@ -28,8 +28,8 @@ class BloomSkyCamera(Camera):
def __init__(self, bs, device): def __init__(self, bs, device):
"""Setup for access to the BloomSky camera images.""" """Setup for access to the BloomSky camera images."""
super(BloomSkyCamera, self).__init__() super(BloomSkyCamera, self).__init__()
self._name = device["DeviceName"] self._name = device['DeviceName']
self._id = device["DeviceID"] self._id = device['DeviceID']
self._bloomsky = bs self._bloomsky = bs
self._url = "" self._url = ""
self._last_url = "" self._last_url = ""
@ -42,7 +42,7 @@ class BloomSkyCamera(Camera):
def camera_image(self): def camera_image(self):
"""Update the camera's image if it has changed.""" """Update the camera's image if it has changed."""
try: try:
self._url = self._bloomsky.devices[self._id]["Data"]["ImageURL"] self._url = self._bloomsky.devices[self._id]['Data']['ImageURL']
self._bloomsky.refresh_devices() self._bloomsky.refresh_devices()
# If the URL hasn't changed then the image hasn't changed. # If the URL hasn't changed then the image hasn't changed.
if self._url != self._last_url: if self._url != self._last_url:

27
homeassistant/components/camera/netatmo.py
View File

@ -6,34 +6,43 @@ https://home-assistant.io/components/camera.netatmo/
""" """
import logging import logging
from datetime import timedelta from datetime import timedelta
import requests import requests
import voluptuous as vol
from homeassistant.util import Throttle from homeassistant.util import Throttle
from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA)
from homeassistant.components.camera import Camera
from homeassistant.loader import get_component from homeassistant.loader import get_component
from homeassistant.helpers import config_validation as cv
DEPENDENCIES = ["netatmo"] DEPENDENCIES = ['netatmo']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
CONF_HOME = 'home' CONF_HOME = 'home'
ATTR_CAMERAS = 'cameras' CONF_CAMERAS = 'cameras'
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=10) MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=10)
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_HOME): cv.string,
vol.Optional(CONF_CAMERAS, default=[]):
vol.All(cv.ensure_list, [cv.string]),
})
# pylint: disable=unused-argument # pylint: disable=unused-argument
def setup_platform(hass, config, add_devices_callback, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup access to Netatmo Welcome cameras.""" """Setup access to Netatmo Welcome cameras."""
netatmo = get_component('netatmo') netatmo = get_component('netatmo')
home = config.get(CONF_HOME, None) home = config.get(CONF_HOME)
data = WelcomeData(netatmo.NETATMO_AUTH, home) data = WelcomeData(netatmo.NETATMO_AUTH, home)
for camera_name in data.get_camera_names(): for camera_name in data.get_camera_names():
if ATTR_CAMERAS in config: if CONF_CAMERAS in config:
if camera_name not in config[ATTR_CAMERAS]: if camera_name not in config[CONF_CAMERAS]:
continue continue
add_devices_callback([WelcomeCamera(data, camera_name, home)]) add_devices([WelcomeCamera(data, camera_name, home)])
class WelcomeCamera(Camera): class WelcomeCamera(Camera):