From d4672b8345f8ca30a1a2a7295ba9a3239b508756 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 15 Nov 2022 15:47:41 -0800 Subject: [PATCH] run black --- custom_components/sonoff/core/devices.py | 4 ++-- tests/test_entity.py | 21 +++++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/custom_components/sonoff/core/devices.py b/custom_components/sonoff/core/devices.py index b1c582f3..66b3f08d 100644 --- a/custom_components/sonoff/core/devices.py +++ b/custom_components/sonoff/core/devices.py @@ -17,7 +17,6 @@ from homeassistant.components.sensor import SensorEntity from homeassistant.components.switch import SwitchEntity -from .ewelink import XDevice from ..binary_sensor import XBinarySensor, XWiFiDoor, XZigbeeMotion from ..climate import XClimateNS, XClimateTH, XThermostat from ..core.entity import XEntity @@ -39,6 +38,7 @@ from ..remote import XRemote from ..sensor import ( XEnergySensor, + XEnergySensorDualR3, XHumidityTH, XOutdoorTempNS, XRemoteButton, @@ -47,9 +47,9 @@ XTemperatureTH, XUnknown, XWiFiDoorBattery, - XEnergySensorDualR3, ) from ..switch import XSwitch, XSwitches, XSwitchTH, XToggle, XZigbeeSwitches +from .ewelink import XDevice # supported custom device_class DEVICE_CLASS = { diff --git a/tests/test_entity.py b/tests/test_entity.py index a5aac59e..478d822b 100644 --- a/tests/test_entity.py +++ b/tests/test_entity.py @@ -38,6 +38,7 @@ from custom_components.sonoff.number import XNumber, XPulseWidth from custom_components.sonoff.sensor import ( XEnergySensor, + XEnergySensorDualR3, XOutdoorTempNS, XRemoteButton, XSensor, @@ -450,13 +451,9 @@ def test_dual_r3(): "getKwh_01": 2, "calibration": 1, }, - }, { - "devices": { - DEVICEID: { - "reporting": {"energy_1": [3600, 3]} - } - } - }) + }, + {"devices": {DEVICEID: {"reporting": {"energy_1": [3600, 3]}}}}, + ) volt: XSensor = next(e for e in entities if e.uid == "voltage_1") assert volt.state == 247.62 @@ -468,16 +465,16 @@ def test_dual_r3(): assert cover.state_attributes == {"current_position": 0} # Get history if we use reporting - energy_1: XEnergySensor_DualR3 = next(e for e in entities if e.uid == "energy_1") - energy_1.internal_update({'kwhHistories_00': '0034007412340000'}) + energy_1: XEnergySensorDualR3 = next(e for e in entities if e.uid == "energy_1") + energy_1.internal_update({"kwhHistories_00": "0034007412340000"}) assert energy_1.state == 0.34 assert energy_1.extra_state_attributes == {"history": [0.34, 0.74, 12.34]} # Skip history if we don't use reporting - energy_2: XEnergySensor_DualR3 = next(e for e in entities if e.uid == "energy_2") - energy_2.internal_update({'kwhHistories_01': '0201000000000000'}) + energy_2: XEnergySensorDualR3 = next(e for e in entities if e.uid == "energy_2") + energy_2.internal_update({"kwhHistories_01": "0201000000000000"}) assert energy_2.state == 2.01 - assert energy_2.extra_state_attributes == None + assert energy_2.extra_state_attributes is None def test_diffuser():