From b209dd126fbab6c0af6e165c23f9d6b076cd7ff7 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 2 Jan 2019 16:40:56 -0500 Subject: [PATCH 1/2] Add optional country parameter mychevy 1.2.0 provides the ability to work in canada as well as the us (there are different service urls for each region). This creates a new config option to enable it. --- homeassistant/components/mychevy.py | 8 ++++++-- requirements_all.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/mychevy.py b/homeassistant/components/mychevy.py index a439e7f35e1318..971f5b79b42982 100644 --- a/homeassistant/components/mychevy.py +++ b/homeassistant/components/mychevy.py @@ -16,7 +16,7 @@ from homeassistant.helpers import discovery from homeassistant.util import Throttle -REQUIREMENTS = ["mychevy==1.1.0"] +REQUIREMENTS = ["mychevy==1.2.0"] DOMAIN = 'mychevy' UPDATE_TOPIC = DOMAIN @@ -33,10 +33,13 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30) ERROR_SLEEP_TIME = timedelta(minutes=30) +CONF_COUNTRY = 'country' CONFIG_SCHEMA = vol.Schema({ DOMAIN: vol.Schema({ vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_PASSWORD): cv.string, + vol.Optional(CONF_COUNTRY, default='us'): vol.All( + cv.string, vol.In(['us', 'ca'])) }), }, extra=vol.ALLOW_EXTRA) @@ -72,7 +75,8 @@ def setup(hass, base_config): email = config.get(CONF_USERNAME) password = config.get(CONF_PASSWORD) - hass.data[DOMAIN] = MyChevyHub(mc.MyChevy(email, password), hass, + country = config.get(CONF_COUNTRY) + hass.data[DOMAIN] = MyChevyHub(mc.MyChevy(email, password, country), hass, base_config) hass.data[DOMAIN].start() diff --git a/requirements_all.txt b/requirements_all.txt index 31106317c29800..4b11cbd67d968c 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -680,7 +680,7 @@ motorparts==1.0.2 mutagen==1.41.1 # homeassistant.components.mychevy -mychevy==1.1.0 +mychevy==1.2.0 # homeassistant.components.mycroft mycroftapi==2.0 From ecaf9f5a1d4d9066cb458e8ae3f1beda9ad59eb9 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 3 Jan 2019 21:52:24 +0100 Subject: [PATCH 2/2] Update mychevy.py --- homeassistant/components/mychevy.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/mychevy.py b/homeassistant/components/mychevy.py index 971f5b79b42982..209027ad4727c4 100644 --- a/homeassistant/components/mychevy.py +++ b/homeassistant/components/mychevy.py @@ -34,12 +34,14 @@ ERROR_SLEEP_TIME = timedelta(minutes=30) CONF_COUNTRY = 'country' +DEFAULT_COUNTRY = 'us' + CONFIG_SCHEMA = vol.Schema({ DOMAIN: vol.Schema({ vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_PASSWORD): cv.string, - vol.Optional(CONF_COUNTRY, default='us'): vol.All( - cv.string, vol.In(['us', 'ca'])) + vol.Optional(CONF_COUNTRY, default=DEFAULT_COUNTRY): + vol.All(cv.string, vol.In(['us', 'ca'])) }), }, extra=vol.ALLOW_EXTRA)