apply small feedback suggestions from a previous PR that is already m…

…erged (home-assistant#37551)
agners · Jul 7, 2020 · e5872cc · e5872cc
1 parent 27ef8a1
commit e5872cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/homeassistant/components/bond/__init__.py b/homeassistant/components/bond/__init__.py
@@ -2,16 +2,13 @@
 import asyncio
 
 from bond import Bond
-import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST
 from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
 
-CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema({})}, extra=vol.ALLOW_EXTRA)
-
 PLATFORMS = ["cover"]
 
 

diff --git a/homeassistant/components/bond/config_flow.py b/homeassistant/components/bond/config_flow.py
@@ -51,15 +51,15 @@ async def async_step_user(self, user_input=None):
         if user_input is not None:
             try:
                 info = await validate_input(self.hass, user_input)
-
-                return self.async_create_entry(title=info["title"], data=user_input)
             except CannotConnect:
                 errors["base"] = "cannot_connect"
             except InvalidAuth:
                 errors["base"] = "invalid_auth"
             except Exception:  # pylint: disable=broad-except
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
+            else:
+                return self.async_create_entry(title=info["title"], data=user_input)
 
         return self.async_show_form(
             step_id="user", data_schema=DATA_SCHEMA, errors=errors

diff --git a/homeassistant/components/bond/cover.py b/homeassistant/components/bond/cover.py
@@ -64,7 +64,7 @@ def name(self) -> Optional[str]:
     @property
     def device_info(self) -> Optional[Dict[str, Any]]:
         """Get a an HA device representing this cover."""
-        return {ATTR_NAME: self.name, "identifiers": {(DOMAIN, self.unique_id)}}
+        return {ATTR_NAME: self.name, "identifiers": {(DOMAIN, self._device.device_id)}}
 
     @property
     def is_closed(self):