From 9a570d7c3215d1196a8a80f4148d4c19bbdde8ec Mon Sep 17 00:00:00 2001 From: tkdrob Date: Fri, 5 Feb 2021 08:02:28 -0500 Subject: [PATCH] Use core constants for bmw_connected_drive (#46042) --- homeassistant/components/bmw_connected_drive/__init__.py | 2 +- homeassistant/components/bmw_connected_drive/config_flow.py | 4 ++-- homeassistant/components/bmw_connected_drive/const.py | 1 - tests/components/bmw_connected_drive/test_config_flow.py | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/bmw_connected_drive/__init__.py b/homeassistant/components/bmw_connected_drive/__init__.py index e9f6a0d7f6f..ac25636a066 100644 --- a/homeassistant/components/bmw_connected_drive/__init__.py +++ b/homeassistant/components/bmw_connected_drive/__init__.py @@ -12,6 +12,7 @@ from homeassistant.const import ( ATTR_ATTRIBUTION, CONF_NAME, CONF_PASSWORD, + CONF_REGION, CONF_USERNAME, ) from homeassistant.core import HomeAssistant, callback @@ -28,7 +29,6 @@ from .const import ( CONF_ACCOUNT, CONF_ALLOWED_REGIONS, CONF_READ_ONLY, - CONF_REGION, CONF_USE_LOCATION, DATA_ENTRIES, DATA_HASS_CONFIG, diff --git a/homeassistant/components/bmw_connected_drive/config_flow.py b/homeassistant/components/bmw_connected_drive/config_flow.py index a6081d5ccc1..8315a1322e2 100644 --- a/homeassistant/components/bmw_connected_drive/config_flow.py +++ b/homeassistant/components/bmw_connected_drive/config_flow.py @@ -6,11 +6,11 @@ from bimmer_connected.country_selector import get_region_from_name import voluptuous as vol from homeassistant import config_entries, core, exceptions -from homeassistant.const import CONF_PASSWORD, CONF_SOURCE, CONF_USERNAME +from homeassistant.const import CONF_PASSWORD, CONF_REGION, CONF_SOURCE, CONF_USERNAME from homeassistant.core import callback from . import DOMAIN # pylint: disable=unused-import -from .const import CONF_ALLOWED_REGIONS, CONF_READ_ONLY, CONF_REGION, CONF_USE_LOCATION +from .const import CONF_ALLOWED_REGIONS, CONF_READ_ONLY, CONF_USE_LOCATION _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/bmw_connected_drive/const.py b/homeassistant/components/bmw_connected_drive/const.py index 65dc7fde595..7af24496838 100644 --- a/homeassistant/components/bmw_connected_drive/const.py +++ b/homeassistant/components/bmw_connected_drive/const.py @@ -1,7 +1,6 @@ """Const file for the BMW Connected Drive integration.""" ATTRIBUTION = "Data provided by BMW Connected Drive" -CONF_REGION = "region" CONF_ALLOWED_REGIONS = ["china", "north_america", "rest_of_world"] CONF_READ_ONLY = "read_only" CONF_USE_LOCATION = "use_location" diff --git a/tests/components/bmw_connected_drive/test_config_flow.py b/tests/components/bmw_connected_drive/test_config_flow.py index 52433f2f58f..d56978deb27 100644 --- a/tests/components/bmw_connected_drive/test_config_flow.py +++ b/tests/components/bmw_connected_drive/test_config_flow.py @@ -5,10 +5,9 @@ from homeassistant import config_entries, data_entry_flow from homeassistant.components.bmw_connected_drive.config_flow import DOMAIN from homeassistant.components.bmw_connected_drive.const import ( CONF_READ_ONLY, - CONF_REGION, CONF_USE_LOCATION, ) -from homeassistant.const import CONF_PASSWORD, CONF_USERNAME +from homeassistant.const import CONF_PASSWORD, CONF_REGION, CONF_USERNAME from tests.common import MockConfigEntry