From b34f1c0291cc9c940f7027f6cec7b712d90d311a Mon Sep 17 00:00:00 2001 From: raman325 <7243222+raman325@users.noreply.github.com> Date: Mon, 6 Jan 2020 11:43:58 -0500 Subject: [PATCH 1/8] move constants, move schema validation to init, prepare for zeroconf/config flow --- homeassistant/components/vizio/media_player.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py index 35b54284c93d43..57e890dfa6b8b5 100644 --- a/homeassistant/components/vizio/media_player.py +++ b/homeassistant/components/vizio/media_player.py @@ -4,10 +4,9 @@ from pyvizio import Vizio from requests.packages import urllib3 -import voluptuous as vol from homeassistant import util -from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerDevice +from homeassistant.components.media_player import MediaPlayerDevice from homeassistant.components.media_player.const import ( SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK, From 08a1c2e6907348b8774ca914be2ca387e7b7a619 Mon Sep 17 00:00:00 2001 From: raman325 <7243222+raman325@users.noreply.github.com> Date: Mon, 6 Jan 2020 11:59:04 -0500 Subject: [PATCH 2/8] mistake in refactor --- homeassistant/components/vizio/media_player.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py index 57e890dfa6b8b5..a06f7bd76c279a 100644 --- a/homeassistant/components/vizio/media_player.py +++ b/homeassistant/components/vizio/media_player.py @@ -4,9 +4,10 @@ from pyvizio import Vizio from requests.packages import urllib3 +import voluptous as vol from homeassistant import util -from homeassistant.components.media_player import MediaPlayerDevice +from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerDevice from homeassistant.components.media_player.const import ( SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK, From 5b73806162c24e93bd88a91eff2af5a49454e463 Mon Sep 17 00:00:00 2001 From: raman325 <7243222+raman325@users.noreply.github.com> Date: Mon, 6 Jan 2020 12:49:17 -0500 Subject: [PATCH 3/8] update .coveragerc, move validate_auth to __init__, only attempt to get ESN if device setup is validated --- homeassistant/components/vizio/media_player.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py index a06f7bd76c279a..0371d40c200eec 100644 --- a/homeassistant/components/vizio/media_player.py +++ b/homeassistant/components/vizio/media_player.py @@ -4,7 +4,7 @@ from pyvizio import Vizio from requests.packages import urllib3 -import voluptous as vol +import voluptuous as vol from homeassistant import util from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerDevice @@ -56,7 +56,11 @@ } +<<<<<<< HEAD PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend(VIZIO_SCHEMA), validate_auth) +======= +PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend(VIZIO_SCHEMA, validate_auth)) +>>>>>>> update .coveragerc, move validate_auth to __init__, only attempt to get ESN if device setup is validated def setup_platform(hass, config, add_entities, discovery_info=None): From 066f8580719a217c880c7eff7230a1c12df749fe Mon Sep 17 00:00:00 2001 From: raman325 <7243222+raman325@users.noreply.github.com> Date: Mon, 6 Jan 2020 13:41:09 -0500 Subject: [PATCH 4/8] fix schema validation --- homeassistant/components/vizio/media_player.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py index 0371d40c200eec..d09ecac07c30b3 100644 --- a/homeassistant/components/vizio/media_player.py +++ b/homeassistant/components/vizio/media_player.py @@ -56,11 +56,15 @@ } +<<<<<<< HEAD <<<<<<< HEAD PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend(VIZIO_SCHEMA), validate_auth) ======= PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend(VIZIO_SCHEMA, validate_auth)) >>>>>>> update .coveragerc, move validate_auth to __init__, only attempt to get ESN if device setup is validated +======= +PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend(VIZIO_SCHEMA), validate_auth) +>>>>>>> fix schema validation def setup_platform(hass, config, add_entities, discovery_info=None): From 3e30db400a4b540361c4c47773e0a0f80b89f333 Mon Sep 17 00:00:00 2001 From: raman325 <7243222+raman325@users.noreply.github.com> Date: Mon, 6 Jan 2020 19:01:24 -0500 Subject: [PATCH 5/8] remove suppress warning config option --- homeassistant/components/vizio/__init__.py | 2 -- homeassistant/components/vizio/const.py | 1 - homeassistant/components/vizio/manifest.json | 3 ++- homeassistant/components/vizio/media_player.py | 15 +-------------- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/vizio/__init__.py b/homeassistant/components/vizio/__init__.py index 00d34fc6591b47..3ffbf46f92858e 100644 --- a/homeassistant/components/vizio/__init__.py +++ b/homeassistant/components/vizio/__init__.py @@ -10,7 +10,6 @@ from homeassistant.helpers import config_validation as cv from .const import ( - CONF_SUPPRESS_WARNING, CONF_VOLUME_STEP, DEFAULT_DEVICE_CLASS, DEFAULT_NAME, @@ -33,7 +32,6 @@ def validate_auth(config): vol.Required(CONF_HOST): cv.string, vol.Optional(CONF_ACCESS_TOKEN): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, - vol.Optional(CONF_SUPPRESS_WARNING, default=False): cv.boolean, vol.Optional(CONF_DEVICE_CLASS, default=DEFAULT_DEVICE_CLASS): vol.All( cv.string, vol.Lower, vol.In(["tv", "soundbar"]) ), diff --git a/homeassistant/components/vizio/const.py b/homeassistant/components/vizio/const.py index f668fb0795fa62..828c4e600e09cc 100644 --- a/homeassistant/components/vizio/const.py +++ b/homeassistant/components/vizio/const.py @@ -1,6 +1,5 @@ """Constants used by vizio component.""" -CONF_SUPPRESS_WARNING = "suppress_warning" CONF_VOLUME_STEP = "volume_step" DEFAULT_NAME = "Vizio SmartCast" diff --git a/homeassistant/components/vizio/manifest.json b/homeassistant/components/vizio/manifest.json index 25070462a82ca2..10ccee1f839949 100644 --- a/homeassistant/components/vizio/manifest.json +++ b/homeassistant/components/vizio/manifest.json @@ -3,8 +3,9 @@ "name": "Vizio", "documentation": "https://www.home-assistant.io/integrations/vizio", "requirements": [ - "pyvizio==0.0.11" + "pyvizio==0.0.12" ], "dependencies": [], + "config_flow": true, "codeowners": ["@raman325"] } diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py index d09ecac07c30b3..2f0eca13b7ae17 100644 --- a/homeassistant/components/vizio/media_player.py +++ b/homeassistant/components/vizio/media_player.py @@ -3,7 +3,6 @@ import logging from pyvizio import Vizio -from requests.packages import urllib3 import voluptuous as vol from homeassistant import util @@ -28,13 +27,7 @@ ) from . import VIZIO_SCHEMA, validate_auth -from .const import ( - CONF_SUPPRESS_WARNING, - CONF_VOLUME_STEP, - DEFAULT_NAME, - DEVICE_ID, - ICON, -) +from .const import CONF_VOLUME_STEP, DEFAULT_NAME, DEVICE_ID, ICON _LOGGER = logging.getLogger(__name__) @@ -86,12 +79,6 @@ def setup_platform(hass, config, add_entities, discovery_info=None): ) return - if config[CONF_SUPPRESS_WARNING]: - _LOGGER.warning( - "InsecureRequestWarning is disabled " - "because of Vizio platform configuration" - ) - urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) add_entities([device], True) From 5eea6b32fa9ce6f3ec0c081056f0bf28aafa15c2 Mon Sep 17 00:00:00 2001 From: raman325 <7243222+raman325@users.noreply.github.com> Date: Mon, 6 Jan 2020 20:20:34 -0500 Subject: [PATCH 6/8] remove config_flow from manifest since its not ready yet --- homeassistant/components/vizio/manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/homeassistant/components/vizio/manifest.json b/homeassistant/components/vizio/manifest.json index 10ccee1f839949..bcf11cbfa8b1fd 100644 --- a/homeassistant/components/vizio/manifest.json +++ b/homeassistant/components/vizio/manifest.json @@ -6,6 +6,5 @@ "pyvizio==0.0.12" ], "dependencies": [], - "config_flow": true, "codeowners": ["@raman325"] } From 26fcb796fdcf1c8bdfcf59c166bfa1c7f803e6f6 Mon Sep 17 00:00:00 2001 From: raman325 <7243222+raman325@users.noreply.github.com> Date: Mon, 6 Jan 2020 20:29:45 -0500 Subject: [PATCH 7/8] update requirements_all.txt --- requirements_all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_all.txt b/requirements_all.txt index 372cd4e9d15668..31e0d2be565e06 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1696,7 +1696,7 @@ pyversasense==0.0.6 pyvesync==1.1.0 # homeassistant.components.vizio -pyvizio==0.0.11 +pyvizio==0.0.12 # homeassistant.components.velux pyvlx==0.2.12 From 141986c787e1fb75cc654f6e662464caba83b483 Mon Sep 17 00:00:00 2001 From: raman325 <7243222+raman325@users.noreply.github.com> Date: Mon, 6 Jan 2020 20:43:55 -0500 Subject: [PATCH 8/8] fix issue with merge conflict --- homeassistant/components/vizio/media_player.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py index 2f0eca13b7ae17..418cf8e3835187 100644 --- a/homeassistant/components/vizio/media_player.py +++ b/homeassistant/components/vizio/media_player.py @@ -49,15 +49,7 @@ } -<<<<<<< HEAD -<<<<<<< HEAD PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend(VIZIO_SCHEMA), validate_auth) -======= -PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend(VIZIO_SCHEMA, validate_auth)) ->>>>>>> update .coveragerc, move validate_auth to __init__, only attempt to get ESN if device setup is validated -======= -PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend(VIZIO_SCHEMA), validate_auth) ->>>>>>> fix schema validation def setup_platform(hass, config, add_entities, discovery_info=None):