diff --git a/homeassistant/components/media_player/kodi.py b/homeassistant/components/media_player/kodi.py index 3764677c847..684e49ad4b5 100644 --- a/homeassistant/components/media_player/kodi.py +++ b/homeassistant/components/media_player/kodi.py @@ -25,12 +25,11 @@ from homeassistant.components.media_player import ( SUPPORT_TURN_ON) from homeassistant.const import ( STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING, CONF_HOST, CONF_NAME, - CONF_PORT, CONF_SSL, CONF_PROXY_SSL, CONF_USERNAME, CONF_PASSWORD, + CONF_PORT, CONF_PROXY_SSL, CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT, EVENT_HOMEASSISTANT_STOP) from homeassistant.core import callback from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers import script, config_validation as cv -from homeassistant.helpers.deprecation import get_deprecated from homeassistant.helpers.template import Template from homeassistant.util.yaml import dump @@ -161,16 +160,9 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None): host = config.get(CONF_HOST) port = config.get(CONF_PORT) tcp_port = config.get(CONF_TCP_PORT) - encryption = get_deprecated(config, CONF_PROXY_SSL, CONF_SSL) + encryption = config.get(CONF_PROXY_SSL) websocket = config.get(CONF_ENABLE_WEBSOCKET) - if host.startswith('http://') or host.startswith('https://'): - host = host.lstrip('http://').lstrip('https://') - _LOGGER.warning( - "Kodi host name should no longer conatin http:// See updated " - "definitions here: " - "https://home-assistant.io/components/media_player.kodi/") - entity = KodiDevice( hass, name=name,