From 17bdb9558a056cf550083932327e3d4c581b3da6 Mon Sep 17 00:00:00 2001 From: Keaton Taylor Date: Mon, 24 Apr 2017 19:59:51 -0500 Subject: [PATCH] Fixes utf-8 encoding no longer required by python-openzwave0.3.3 (#7266) * Fixes utf-8 encoding no longer required by libopenzwave0.3.3 Removes byte encoding for values operation mode, fan mode and swing mode. * Fix zwave climate tests for utf-8 change --- homeassistant/components/climate/zwave.py | 7 ++-- tests/components/climate/test_zwave.py | 40 +++++++++++------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/homeassistant/components/climate/zwave.py b/homeassistant/components/climate/zwave.py index 74fadb8c5fd..a0fe3ce4c11 100755 --- a/homeassistant/components/climate/zwave.py +++ b/homeassistant/components/climate/zwave.py @@ -189,19 +189,18 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice): def set_fan_mode(self, fan): """Set new target fan mode.""" if self.values.fan_mode: - self.values.fan_mode.data = bytes(fan, 'utf-8') + self.values.fan_mode.data = fan def set_operation_mode(self, operation_mode): """Set new target operation mode.""" if self.values.mode: - self.values.mode.data = bytes(operation_mode, 'utf-8') + self.values.mode.data = operation_mode def set_swing_mode(self, swing_mode): """Set new target swing mode.""" if self._zxt_120 == 1: if self.values.zxt_120_swing_mode: - self.values.zxt_120_swing_mode.data = bytes( - swing_mode, 'utf-8') + self.values.zxt_120_swing_mode.data = swing_mode @property def device_state_attributes(self): diff --git a/tests/components/climate/test_zwave.py b/tests/components/climate/test_zwave.py index ed9e0cf9daa..fbd6ea7f798 100644 --- a/tests/components/climate/test_zwave.py +++ b/tests/components/climate/test_zwave.py @@ -16,8 +16,8 @@ def device(hass, mock_openzwave): values = MockEntityValues( primary=MockValue(data=1, node=node), temperature=MockValue(data=5, node=node, units=None), - mode=MockValue(data=b'test1', data_items=[0, 1, 2], node=node), - fan_mode=MockValue(data=b'test2', data_items=[3, 4, 5], node=node), + mode=MockValue(data='test1', data_items=[0, 1, 2], node=node), + fan_mode=MockValue(data='test2', data_items=[3, 4, 5], node=node), operating_state=MockValue(data=6, node=node), fan_state=MockValue(data=7, node=node), ) @@ -34,12 +34,12 @@ def device_zxt_120(hass, mock_openzwave): values = MockEntityValues( primary=MockValue(data=1, node=node), temperature=MockValue(data=5, node=node, units=None), - mode=MockValue(data=b'test1', data_items=[0, 1, 2], node=node), - fan_mode=MockValue(data=b'test2', data_items=[3, 4, 5], node=node), + mode=MockValue(data='test1', data_items=[0, 1, 2], node=node), + fan_mode=MockValue(data='test2', data_items=[3, 4, 5], node=node), operating_state=MockValue(data=6, node=node), fan_state=MockValue(data=7, node=node), zxt_120_swing_mode=MockValue( - data=b'test3', data_items=[6, 7, 8], node=node), + data='test3', data_items=[6, 7, 8], node=node), ) device = zwave.get_device(hass, node=node, values=values, node_config={}) @@ -54,16 +54,16 @@ def test_zxt_120_swing_mode(device_zxt_120): assert device._zxt_120 == 1 # Test set mode - assert device.values.zxt_120_swing_mode.data == b'test3' + assert device.values.zxt_120_swing_mode.data == 'test3' device.set_swing_mode('test_swing_set') - assert device.values.zxt_120_swing_mode.data == b'test_swing_set' + assert device.values.zxt_120_swing_mode.data == 'test_swing_set' # Test mode changed value_changed(device.values.zxt_120_swing_mode) - assert device.current_swing_mode == b'test_swing_set' - device.values.zxt_120_swing_mode.data = b'test_swing_updated' + assert device.current_swing_mode == 'test_swing_set' + device.values.zxt_120_swing_mode.data = 'test_swing_updated' value_changed(device.values.zxt_120_swing_mode) - assert device.current_swing_mode == b'test_swing_updated' + assert device.current_swing_mode == 'test_swing_updated' def test_temperature_unit(device): @@ -104,16 +104,16 @@ def test_target_value_set(device): def test_operation_value_set(device): """Test values changed for climate device.""" - assert device.values.mode.data == b'test1' + assert device.values.mode.data == 'test1' device.set_operation_mode('test_set') - assert device.values.mode.data == b'test_set' + assert device.values.mode.data == 'test_set' def test_fan_mode_value_set(device): """Test values changed for climate device.""" - assert device.values.fan_mode.data == b'test2' + assert device.values.fan_mode.data == 'test2' device.set_fan_mode('test_fan_set') - assert device.values.fan_mode.data == b'test_fan_set' + assert device.values.fan_mode.data == 'test_fan_set' def test_target_value_changed(device): @@ -134,18 +134,18 @@ def test_temperature_value_changed(device): def test_operation_value_changed(device): """Test values changed for climate device.""" - assert device.current_operation == b'test1' - device.values.mode.data = b'test_updated' + assert device.current_operation == 'test1' + device.values.mode.data = 'test_updated' value_changed(device.values.mode) - assert device.current_operation == b'test_updated' + assert device.current_operation == 'test_updated' def test_fan_mode_value_changed(device): """Test values changed for climate device.""" - assert device.current_fan_mode == b'test2' - device.values.fan_mode.data = b'test_updated_fan' + assert device.current_fan_mode == 'test2' + device.values.fan_mode.data = 'test_updated_fan' value_changed(device.values.fan_mode) - assert device.current_fan_mode == b'test_updated_fan' + assert device.current_fan_mode == 'test_updated_fan' def test_operating_state_value_changed(device):