From f2a38677fcee857c699bc2f459c997a223cd233c Mon Sep 17 00:00:00 2001
From: Sebastian Muszynski <basti@linkt.de>
Date: Thu, 2 Nov 2017 21:38:18 +0100
Subject: [PATCH] Bump python-miio for improved device support (#10294)

* Bump python-miio for improved device support.

* Requirements defines updated.
---
 homeassistant/components/fan/xiaomi_miio.py    |  2 +-
 homeassistant/components/light/xiaomi_miio.py  |  6 +++---
 homeassistant/components/switch/xiaomi_miio.py | 10 +++++++---
 homeassistant/components/vacuum/xiaomi_miio.py |  2 +-
 requirements_all.txt                           |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/fan/xiaomi_miio.py b/homeassistant/components/fan/xiaomi_miio.py
index 3b0e0385f13..8fc77d1bf5e 100644
--- a/homeassistant/components/fan/xiaomi_miio.py
+++ b/homeassistant/components/fan/xiaomi_miio.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
 
-REQUIREMENTS = ['python-miio==0.3.0']
+REQUIREMENTS = ['python-miio==0.3.1']
 
 ATTR_TEMPERATURE = 'temperature'
 ATTR_HUMIDITY = 'humidity'
diff --git a/homeassistant/components/light/xiaomi_miio.py b/homeassistant/components/light/xiaomi_miio.py
index b25f2745365..d7d0900ed28 100644
--- a/homeassistant/components/light/xiaomi_miio.py
+++ b/homeassistant/components/light/xiaomi_miio.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
 
-REQUIREMENTS = ['python-miio==0.3.0']
+REQUIREMENTS = ['python-miio==0.3.1']
 
 # The light does not accept cct values < 1
 CCT_MIN = 1
@@ -70,8 +70,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             device = XiaomiPhilipsCeilingLamp(name, light, device_info)
             devices.append(device)
         elif device_info.model == 'philips.light.bulb':
-            from miio import Ceil
-            light = Ceil(host, token)
+            from miio import PhilipsBulb
+            light = PhilipsBulb(host, token)
             device = XiaomiPhilipsLightBall(name, light, device_info)
             devices.append(device)
         else:
diff --git a/homeassistant/components/switch/xiaomi_miio.py b/homeassistant/components/switch/xiaomi_miio.py
index 1191322dce6..aaa37a24c0e 100644
--- a/homeassistant/components/switch/xiaomi_miio.py
+++ b/homeassistant/components/switch/xiaomi_miio.py
@@ -25,7 +25,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
 
-REQUIREMENTS = ['python-miio==0.3.0']
+REQUIREMENTS = ['python-miio==0.3.1']
 
 ATTR_POWER = 'power'
 ATTR_TEMPERATURE = 'temperature'
@@ -68,8 +68,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
         elif device_info.model in ['qmi.powerstrip.v1',
                                    'zimi.powerstrip.v2']:
-            from miio import Strip
-            plug = Strip(host, token)
+            from miio import PowerStrip
+            plug = PowerStrip(host, token)
             device = XiaomiPowerStripSwitch(name, plug, device_info)
             devices.append(device)
         elif device_info.model in ['chuangmi.plug.m1',
@@ -288,5 +288,9 @@ class ChuangMiPlugV1Switch(XiaomiPlugGenericSwitch, SwitchDevice):
             else:
                 self._state = state.is_on
 
+            self._state_attrs.update({
+                ATTR_TEMPERATURE: state.temperature
+            })
+
         except DeviceException as ex:
             _LOGGER.error("Got exception while fetching the state: %s", ex)
diff --git a/homeassistant/components/vacuum/xiaomi_miio.py b/homeassistant/components/vacuum/xiaomi_miio.py
index ed19e220008..829d0878ffe 100644
--- a/homeassistant/components/vacuum/xiaomi_miio.py
+++ b/homeassistant/components/vacuum/xiaomi_miio.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, CONF_TOKEN, STATE_OFF, STATE_ON)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['python-miio==0.3.0']
+REQUIREMENTS = ['python-miio==0.3.1']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 9968ec65fc4..7ae835cb8a4 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -832,7 +832,7 @@ python-juicenet==0.0.5
 # homeassistant.components.light.xiaomi_miio
 # homeassistant.components.switch.xiaomi_miio
 # homeassistant.components.vacuum.xiaomi_miio
-python-miio==0.3.0
+python-miio==0.3.1
 
 # homeassistant.components.media_player.mpd
 python-mpd2==0.5.5