From afdd734b44635734c1c8e5e40878afa0f275bedf Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 2 Sep 2016 06:27:38 +0200 Subject: [PATCH] Use voluptuous for twitter (#3126) --- homeassistant/components/notify/twitter.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/notify/twitter.py b/homeassistant/components/notify/twitter.py index 9284c4fac93..bafdc2403be 100644 --- a/homeassistant/components/notify/twitter.py +++ b/homeassistant/components/notify/twitter.py @@ -6,9 +6,12 @@ https://home-assistant.io/components/notify.twitter/ """ import logging -from homeassistant.components.notify import DOMAIN, BaseNotificationService +import voluptuous as vol + +import homeassistant.helpers.config_validation as cv +from homeassistant.components.notify import (PLATFORM_SCHEMA, + BaseNotificationService) from homeassistant.const import CONF_ACCESS_TOKEN -from homeassistant.helpers import validate_config _LOGGER = logging.getLogger(__name__) REQUIREMENTS = ['TwitterAPI==2.4.2'] @@ -17,16 +20,16 @@ CONF_CONSUMER_KEY = "consumer_key" CONF_CONSUMER_SECRET = "consumer_secret" CONF_ACCESS_TOKEN_SECRET = "access_token_secret" +PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ + vol.Required(CONF_CONSUMER_KEY): cv.string, + vol.Required(CONF_CONSUMER_SECRET): cv.string, + vol.Required(CONF_ACCESS_TOKEN): cv.string, + vol.Required(CONF_ACCESS_TOKEN_SECRET): cv.string, +}) + def get_service(hass, config): """Get the Twitter notification service.""" - if not validate_config({DOMAIN: config}, - {DOMAIN: [CONF_CONSUMER_KEY, CONF_CONSUMER_SECRET, - CONF_ACCESS_TOKEN, - CONF_ACCESS_TOKEN_SECRET]}, - _LOGGER): - return None - return TwitterNotificationService(config[CONF_CONSUMER_KEY], config[CONF_CONSUMER_SECRET], config[CONF_ACCESS_TOKEN],