Merge pull request #426 from reedy/octoberlinting

Fix various linting issues
CJNE · Oct 10, 2023 · 9a34460 · 9a34460
2 parents 170771f + 47c4699
commit 9a34460
Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/custom_components/myenergi/select.py b/custom_components/myenergi/select.py
@@ -3,11 +3,11 @@
 from homeassistant.components.select import SelectEntity
 from homeassistant.helpers import entity_platform
 from pymyenergi.eddi import EDDI_MODES
-from pymyenergi.zappi import CHARGE_MODES
-from pymyenergi.libbi import LIBBI_MODES
 from pymyenergi.libbi import LIBBI_MODE_NAMES
-from pymyenergi.libbi import MODE_STOPPED
+from pymyenergi.libbi import LIBBI_MODES
 from pymyenergi.libbi import MODE_NORMAL
+from pymyenergi.libbi import MODE_STOPPED
+from pymyenergi.zappi import CHARGE_MODES
 
 from .const import DOMAIN
 from .entity import MyenergiEntity

diff --git a/custom_components/myenergi/sensor.py b/custom_components/myenergi/sensor.py
@@ -4,11 +4,11 @@
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.components.sensor import STATE_CLASS_MEASUREMENT
 from homeassistant.components.sensor import STATE_CLASS_TOTAL_INCREASING
+from homeassistant.const import DEVICE_CLASS_BATTERY
 from homeassistant.const import DEVICE_CLASS_ENERGY
 from homeassistant.const import DEVICE_CLASS_POWER
 from homeassistant.const import DEVICE_CLASS_TEMPERATURE
 from homeassistant.const import DEVICE_CLASS_VOLTAGE
-from homeassistant.const import DEVICE_CLASS_BATTERY
 from homeassistant.const import ELECTRIC_POTENTIAL_VOLT
 from homeassistant.const import ENERGY_KILO_WATT_HOUR
 from homeassistant.const import FREQUENCY_HERTZ
@@ -20,8 +20,8 @@
 from pymyenergi import CT_LOAD
 from pymyenergi import EDDI
 from pymyenergi import HARVI
-from pymyenergi import ZAPPI
 from pymyenergi import LIBBI
+from pymyenergi import ZAPPI
 
 from .const import DOMAIN
 from .entity import MyenergiEntity
@@ -497,7 +497,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"SoC",
+                        "SoC",
                         "state_of_charge",
                         DEVICE_CLASS_BATTERY,
                         PERCENTAGE,
@@ -510,7 +510,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Voltage",
+                        "Voltage",
                         "supply_voltage",
                         DEVICE_CLASS_VOLTAGE,
                         ELECTRIC_POTENTIAL_VOLT,
@@ -526,7 +526,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Frequency",
+                        "Frequency",
                         "supply_frequency",
                         None,
                         FREQUENCY_HERTZ,
@@ -542,7 +542,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Inverter size",
+                        "Inverter size",
                         "inverter_size",
                         None,
                         ENERGY_KILO_WATT_HOUR,
@@ -557,13 +557,13 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Battery size",
+                        "Battery size",
                         "battery_size",
                         None,
                         ENERGY_KILO_WATT_HOUR,
                         ENTITY_CATEGORY_DIAGNOSTIC,
                         ICON_POWER,
-                    )
+                    ),
                 )
             )
             sensors.append(
@@ -572,13 +572,13 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Status",
+                        "Status",
                         "status",
                         None,
                         None,
                         None,
                         ICON_HOME_BATTERY,
-                    )
+                    ),
                 )
             )
             sensors.append(
@@ -587,14 +587,14 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Grid import today",
+                        "Grid import today",
                         "grid_import",
                         DEVICE_CLASS_ENERGY,
                         ENERGY_KILO_WATT_HOUR,
                         None,
                         None,
                         STATE_CLASS_TOTAL_INCREASING,
-                    )
+                    ),
                 )
             )
             sensors.append(
@@ -603,14 +603,14 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Grid export today",
+                        "Grid export today",
                         "grid_export",
                         DEVICE_CLASS_ENERGY,
                         ENERGY_KILO_WATT_HOUR,
                         None,
                         None,
                         STATE_CLASS_TOTAL_INCREASING,
-                    )
+                    ),
                 )
             )
             sensors.append(
@@ -619,14 +619,14 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Battery charge today",
+                        "Battery charge today",
                         "battery_charge",
                         DEVICE_CLASS_ENERGY,
                         ENERGY_KILO_WATT_HOUR,
                         None,
                         None,
                         STATE_CLASS_TOTAL_INCREASING,
-                    )
+                    ),
                 )
             )
             sensors.append(
@@ -635,14 +635,14 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Battery discharge today",
+                        "Battery discharge today",
                         "battery_discharge",
                         DEVICE_CLASS_ENERGY,
                         ENERGY_KILO_WATT_HOUR,
                         None,
                         None,
                         STATE_CLASS_TOTAL_INCREASING,
-                    )
+                    ),
                 )
             )
             sensors.append(
@@ -651,14 +651,14 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     device,
                     entry,
                     create_meta(
-                        f"Solar generation today",
+                        "Solar generation today",
                         "generated",
                         DEVICE_CLASS_ENERGY,
                         ENERGY_KILO_WATT_HOUR,
                         None,
                         None,
                         STATE_CLASS_TOTAL_INCREASING,
-                    )
+                    ),
                 )
             )
     async_add_devices(sensors)

diff --git a/tests/test_init.py b/tests/test_init.py
@@ -36,16 +36,12 @@ async def test_setup_unload_and_reload_entry(hass, bypass_get_data):
     # call, no code from custom_components/myenergi/api.py actually runs.
     assert await async_setup_entry(hass, config_entry)
     assert DOMAIN in hass.data and config_entry.entry_id in hass.data[DOMAIN]
-    assert (
-        type(hass.data[DOMAIN][config_entry.entry_id]) == MyenergiDataUpdateCoordinator
-    )
+    assert hass.data[DOMAIN][config_entry.entry_id] is MyenergiDataUpdateCoordinator
 
     # Reload the entry and assert that the data from above is still there
     assert await async_reload_entry(hass, config_entry) is None
     assert DOMAIN in hass.data and config_entry.entry_id in hass.data[DOMAIN]
-    assert (
-        type(hass.data[DOMAIN][config_entry.entry_id]) == MyenergiDataUpdateCoordinator
-    )
+    assert hass.data[DOMAIN][config_entry.entry_id] is MyenergiDataUpdateCoordinator
 
     # Unload the entry and verify that the data has been removed
     assert await async_unload_entry(hass, config_entry)