From a9f6dd698e64cf30a4f940628b406c5ea3a63138 Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Tue, 7 Jan 2020 07:31:13 -0500 Subject: [PATCH] Remove `suppress_warning` from config options for vizio component (#30536) * move constants, move schema validation to init, prepare for zeroconf/config flow * mistake in refactor * update .coveragerc, move validate_auth to __init__, only attempt to get ESN if device setup is validated * fix schema validation * remove suppress warning config option * remove config_flow from manifest since its not ready yet * update requirements_all.txt * fix issue with merge conflict --- homeassistant/components/vizio/__init__.py | 2 -- homeassistant/components/vizio/const.py | 1 - homeassistant/components/vizio/manifest.json | 2 +- homeassistant/components/vizio/media_player.py | 15 +-------------- requirements_all.txt | 2 +- 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/homeassistant/components/vizio/__init__.py b/homeassistant/components/vizio/__init__.py index 00d34fc6591..3ffbf46f928 100644 --- a/homeassistant/components/vizio/__init__.py +++ b/homeassistant/components/vizio/__init__.py @@ -10,7 +10,6 @@ from homeassistant.const import ( 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 @@ VIZIO_SCHEMA = { 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 f668fb0795f..828c4e600e0 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 25070462a82..bcf11cbfa8b 100644 --- a/homeassistant/components/vizio/manifest.json +++ b/homeassistant/components/vizio/manifest.json @@ -3,7 +3,7 @@ "name": "Vizio", "documentation": "https://www.home-assistant.io/integrations/vizio", "requirements": [ - "pyvizio==0.0.11" + "pyvizio==0.0.12" ], "dependencies": [], "codeowners": ["@raman325"] diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py index 35b54284c93..418cf8e3835 100644 --- a/homeassistant/components/vizio/media_player.py +++ b/homeassistant/components/vizio/media_player.py @@ -3,7 +3,6 @@ from datetime import timedelta import logging from pyvizio import Vizio -from requests.packages import urllib3 import voluptuous as vol from homeassistant import util @@ -28,13 +27,7 @@ from homeassistant.const import ( ) 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__) @@ -78,12 +71,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) diff --git a/requirements_all.txt b/requirements_all.txt index a2012380403..dd88fbe406e 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