Wink subscription support (#2324)

homeassistant/components/lock/wink.py

@@ -7,9 +7,10 @@ https://home-assistant.io/components/lock.wink/
 import logging
 
 from homeassistant.components.lock import LockDevice
-from homeassistant.const import CONF_ACCESS_TOKEN, ATTR_BATTERY_LEVEL
+from homeassistant.components.wink import WinkDevice
+from homeassistant.const import CONF_ACCESS_TOKEN
 
-REQUIREMENTS = ['python-wink==0.7.7']
+REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8']
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -30,38 +31,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     add_devices(WinkLockDevice(lock) for lock in pywink.get_locks())
 
 
-class WinkLockDevice(LockDevice):
+class WinkLockDevice(WinkDevice, LockDevice):
     """Representation of a Wink lock."""
 
     def __init__(self, wink):
         """Initialize the lock."""
-        self.wink = wink
-        self._battery = self.wink.battery_level
-
-    @property
-    def unique_id(self):
-        """Return the id of this wink lock."""
-        return "{}.{}".format(self.__class__, self.wink.device_id())
-
-    @property
-    def name(self):
-        """Return the name of the lock if any."""
-        return self.wink.name()
-
-    def update(self):
-        """Update the state of the lock."""
-        self.wink.update_state()
+        WinkDevice.__init__(self, wink)
 
     @property
     def is_locked(self):
         """Return true if device is locked."""
         return self.wink.state()
 
-    @property
-    def available(self):
-        """True if connection == True."""
-        return self.wink.available
-
     def lock(self, **kwargs):
         """Lock the device."""
         self.wink.set_state(True)
@@ -69,16 +50,3 @@ class WinkLockDevice(LockDevice):
     def unlock(self, **kwargs):
         """Unlock the device."""
         self.wink.set_state(False)
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        if self._battery:
-            return {
-                ATTR_BATTERY_LEVEL: self._battery_level,
-            }
-
-    @property
-    def _battery_level(self):
-        """Return the battery level."""
-        return self.wink.battery_level * 100