From 6be20883f066e535ff02288f8b86e40a6f0ce4f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Sep 2016 18:04:46 +0200 Subject: [PATCH] Migrate to voluptuous (#3208) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🐬 --- .../components/media_player/pioneer.py | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/homeassistant/components/media_player/pioneer.py b/homeassistant/components/media_player/pioneer.py index 207e38ecf40..599edf08b37 100644 --- a/homeassistant/components/media_player/pioneer.py +++ b/homeassistant/components/media_player/pioneer.py @@ -7,36 +7,35 @@ https://home-assistant.io/components/media_player.pioneer/ import logging import telnetlib +import voluptuous as vol + from homeassistant.components.media_player import ( - DOMAIN, SUPPORT_PAUSE, SUPPORT_SELECT_SOURCE, - SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, - MediaPlayerDevice) + SUPPORT_PAUSE, SUPPORT_SELECT_SOURCE, MediaPlayerDevice, PLATFORM_SCHEMA, + SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET) from homeassistant.const import ( - CONF_HOST, STATE_OFF, STATE_ON, STATE_UNKNOWN, - CONF_NAME) + CONF_HOST, STATE_OFF, STATE_ON, STATE_UNKNOWN, CONF_NAME) +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) +DEFAULT_NAME = 'Pioneer AVR' + SUPPORT_PIONEER = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \ SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_SELECT_SOURCE MAX_VOLUME = 185 MAX_SOURCE_NUMBERS = 60 +PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ + vol.Required(CONF_HOST): cv.string, + vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, +}) + def setup_platform(hass, config, add_devices, discovery_info=None): """Setup the Pioneer platform.""" - if not config.get(CONF_HOST): - _LOGGER.error( - "Missing required configuration items in %s: %s", - DOMAIN, - CONF_HOST) - return False + pioneer = PioneerDevice(config.get(CONF_NAME), config.get(CONF_HOST)) - pioneer = PioneerDevice( - config.get(CONF_NAME, "Pioneer AVR"), - config.get(CONF_HOST) - ) if pioneer.update(): add_devices([pioneer]) return True @@ -53,7 +52,7 @@ class PioneerDevice(MediaPlayerDevice): """Initialize the Pioneer device.""" self._name = name self._host = host - self._pwstate = "PWR1" + self._pwstate = 'PWR1' self._volume = 0 self._muted = False self._selected_source = ''