From 9176e13a97b57aa062d308acf09148b8baf911b5 Mon Sep 17 00:00:00 2001 From: dilruacs Date: Thu, 28 Mar 2019 02:19:24 +0100 Subject: [PATCH] Modify check for ADB public key (#22378) * Remove check for public key * Remove has_adb_files, directly call cv.isfile * Check for missing adbkey.pub, create dummy if not found * Reorder imports * Bumped androidtv library version, deactivated pubkey test * Code works without pubkey, removed function * Removed "import os", not needed anymore * Bump library version --- homeassistant/components/androidtv/media_player.py | 12 ++---------- requirements_all.txt | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py index 2db3110f2d9..5bce21f05a0 100644 --- a/homeassistant/components/androidtv/media_player.py +++ b/homeassistant/components/androidtv/media_player.py @@ -22,7 +22,7 @@ import homeassistant.helpers.config_validation as cv ANDROIDTV_DOMAIN = 'androidtv' -REQUIREMENTS = ['androidtv==0.0.13'] +REQUIREMENTS = ['androidtv==0.0.14'] _LOGGER = logging.getLogger(__name__) @@ -61,21 +61,13 @@ SERVICE_ADB_COMMAND_SCHEMA = vol.Schema({ }) -def has_adb_files(value): - """Check that ADB key files exist.""" - priv_key = value - pub_key = '{}.pub'.format(value) - cv.isfile(pub_key) - return cv.isfile(priv_key) - - PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ vol.Required(CONF_HOST): cv.string, vol.Optional(CONF_DEVICE_CLASS, default=DEFAULT_DEVICE_CLASS): vol.In(DEVICE_CLASSES), vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, - vol.Optional(CONF_ADBKEY): has_adb_files, + vol.Optional(CONF_ADBKEY): cv.isfile, vol.Optional(CONF_ADB_SERVER_IP): cv.string, vol.Optional(CONF_ADB_SERVER_PORT, default=DEFAULT_ADB_SERVER_PORT): cv.port, diff --git a/requirements_all.txt b/requirements_all.txt index 2e66b5b39e1..2b993100f58 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -158,7 +158,7 @@ alpha_vantage==2.1.0 amcrest==1.2.7 # homeassistant.components.androidtv.media_player -androidtv==0.0.13 +androidtv==0.0.14 # homeassistant.components.anel_pwrctrl.switch anel_pwrctrl-homeassistant==0.0.1.dev2