Skip to content

Commit 53e386b

Browse files
committed
Fix HA deprecated alias warning
1 parent bbcbefe commit 53e386b

13 files changed

+37
-45
lines changed

custom_components/hon/__init__.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from typing import Any
44

55
import voluptuous as vol # type: ignore[import-untyped]
6+
from homeassistant.core import HomeAssistant
67
from homeassistant.config_entries import ConfigEntry
78
from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
89
from homeassistant.helpers import config_validation as cv, aiohttp_client
9-
from homeassistant.helpers.typing import HomeAssistantType
1010
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
1111
from pyhon import Hon
1212

@@ -27,7 +27,7 @@
2727
)
2828

2929

30-
async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool:
30+
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
3131
session = aiohttp_client.async_get_clientsession(hass)
3232
if (config_dir := hass.config.config_dir) is None:
3333
raise ValueError("Missing Config Dir")
@@ -53,8 +53,10 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
5353
return True
5454

5555

56-
async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool:
57-
refresh_token = await hass.data[DOMAIN][entry.unique_id]["hon"]._api._session._auth.get_refresh_token()
56+
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
57+
refresh_token = await hass.data[DOMAIN][entry.unique_id][
58+
"hon"
59+
]._api._session._auth.get_refresh_token()
5860

5961
hass.config_entries.async_update_entry(
6062
entry, data={**entry.data, CONF_REFRESH_TOKEN: refresh_token}

custom_components/hon/binary_sensor.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
BinarySensorEntity,
88
)
99
from homeassistant.config_entries import ConfigEntry
10-
from homeassistant.core import callback
10+
from homeassistant.core import callback, HomeAssistant
1111
from homeassistant.helpers.entity_platform import AddEntitiesCallback
12-
from homeassistant.helpers.typing import HomeAssistantType
1312

1413
from .const import DOMAIN
1514
from .entity import HonEntity
@@ -317,7 +316,7 @@ class HonBinarySensorEntityDescription(BinarySensorEntityDescription):
317316

318317

319318
async def async_setup_entry(
320-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
319+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
321320
) -> None:
322321
entities = []
323322
for device in hass.data[DOMAIN][entry.unique_id]["hon"].appliances:

custom_components/hon/button.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
from homeassistant.components import persistent_notification
55
from homeassistant.components.button import ButtonEntityDescription, ButtonEntity
66
from homeassistant.config_entries import ConfigEntry
7+
from homeassistant.core import HomeAssistant
78
from homeassistant.helpers.entity import EntityCategory
89
from homeassistant.helpers.entity_platform import AddEntitiesCallback
9-
from homeassistant.helpers.typing import HomeAssistantType
1010
from pyhon.appliance import HonAppliance
1111

1212
from .const import DOMAIN
@@ -56,7 +56,7 @@
5656

5757

5858
async def async_setup_entry(
59-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
59+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
6060
) -> None:
6161
entities: list[HonButtonType] = []
6262
for device in hass.data[DOMAIN][entry.unique_id]["hon"].appliances:
@@ -88,7 +88,7 @@ def available(self) -> bool:
8888

8989
class HonDeviceInfo(HonEntity, ButtonEntity):
9090
def __init__(
91-
self, hass: HomeAssistantType, entry: ConfigEntry, device: HonAppliance
91+
self, hass: HomeAssistant, entry: ConfigEntry, device: HonAppliance
9292
) -> None:
9393
super().__init__(hass, entry, device)
9494

@@ -108,7 +108,7 @@ async def async_press(self) -> None:
108108

109109
class HonDataArchive(HonEntity, ButtonEntity):
110110
def __init__(
111-
self, hass: HomeAssistantType, entry: ConfigEntry, device: HonAppliance
111+
self, hass: HomeAssistant, entry: ConfigEntry, device: HonAppliance
112112
) -> None:
113113
super().__init__(hass, entry, device)
114114

custom_components/hon/climate.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
ATTR_TEMPERATURE,
2020
UnitOfTemperature,
2121
)
22-
from homeassistant.core import callback
22+
from homeassistant.core import callback, HomeAssistant
2323
from homeassistant.helpers.entity_platform import AddEntitiesCallback
24-
from homeassistant.helpers.typing import HomeAssistantType
2524
from pyhon.appliance import HonAppliance
2625
from pyhon.parameter.range import HonParameterRange
2726

@@ -104,7 +103,7 @@ class HonClimateEntityDescription(ClimateEntityDescription):
104103

105104

106105
async def async_setup_entry(
107-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
106+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
108107
) -> None:
109108
entities = []
110109
entity: HonClimateEntity | HonACClimateEntity
@@ -130,7 +129,7 @@ class HonACClimateEntity(HonEntity, ClimateEntity):
130129

131130
def __init__(
132131
self,
133-
hass: HomeAssistantType,
132+
hass: HomeAssistant,
134133
entry: ConfigEntry,
135134
device: HonAppliance,
136135
description: HonACClimateEntityDescription,
@@ -299,7 +298,7 @@ class HonClimateEntity(HonEntity, ClimateEntity):
299298

300299
def __init__(
301300
self,
302-
hass: HomeAssistantType,
301+
hass: HomeAssistant,
303302
entry: ConfigEntry,
304303
device: HonAppliance,
305304
description: HonClimateEntityDescription,

custom_components/hon/entity.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
from typing import Optional, Any
22

33
from homeassistant.config_entries import ConfigEntry
4-
from homeassistant.core import callback
4+
from homeassistant.core import callback, HomeAssistant
55
from homeassistant.helpers.entity import DeviceInfo
6-
from homeassistant.helpers.typing import HomeAssistantType
76
from homeassistant.helpers.update_coordinator import (
87
CoordinatorEntity,
98
)
@@ -20,7 +19,7 @@ class HonEntity(CoordinatorEntity[DataUpdateCoordinator[dict[str, Any]]]):
2019

2120
def __init__(
2221
self,
23-
hass: HomeAssistantType,
22+
hass: HomeAssistant,
2423
entry: ConfigEntry,
2524
device: HonAppliance,
2625
description: Optional[HonEntityDescription] = None,

custom_components/hon/fan.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
FanEntityFeature,
99
)
1010
from homeassistant.config_entries import ConfigEntry
11-
from homeassistant.core import callback
11+
from homeassistant.core import callback, HomeAssistant
1212
from homeassistant.helpers.entity_platform import AddEntitiesCallback
13-
from homeassistant.helpers.typing import HomeAssistantType
1413
from homeassistant.util.percentage import (
1514
percentage_to_ranged_value,
1615
ranged_value_to_percentage,
@@ -36,7 +35,7 @@
3635

3736

3837
async def async_setup_entry(
39-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
38+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
4039
) -> None:
4140
entities = []
4241
for device in hass.data[DOMAIN][entry.unique_id]["hon"].appliances:
@@ -56,7 +55,7 @@ class HonFanEntity(HonEntity, FanEntity):
5655

5756
def __init__(
5857
self,
59-
hass: HomeAssistantType,
58+
hass: HomeAssistant,
6059
entry: ConfigEntry,
6160
device: HonAppliance,
6261
description: FanEntityDescription,

custom_components/hon/light.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
ATTR_BRIGHTNESS,
99
)
1010
from homeassistant.config_entries import ConfigEntry
11-
from homeassistant.core import callback
11+
from homeassistant.core import callback, HomeAssistant
1212
from homeassistant.helpers.entity_platform import AddEntitiesCallback
13-
from homeassistant.helpers.typing import HomeAssistantType
1413
from pyhon.appliance import HonAppliance
1514
from pyhon.parameter.range import HonParameterRange
1615

@@ -53,7 +52,7 @@
5352

5453

5554
async def async_setup_entry(
56-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
55+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
5756
) -> None:
5857
entities = []
5958
for device in hass.data[DOMAIN][entry.unique_id]["hon"].appliances:
@@ -73,7 +72,7 @@ class HonLightEntity(HonEntity, LightEntity):
7372

7473
def __init__(
7574
self,
76-
hass: HomeAssistantType,
75+
hass: HomeAssistant,
7776
entry: ConfigEntry,
7877
device: HonAppliance,
7978
description: LightEntityDescription,

custom_components/hon/lock.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
from homeassistant.components.lock import LockEntity, LockEntityDescription
55
from homeassistant.config_entries import ConfigEntry
6-
from homeassistant.core import callback
6+
from homeassistant.core import callback, HomeAssistant
77
from homeassistant.helpers.entity_platform import AddEntitiesCallback
8-
from homeassistant.helpers.typing import HomeAssistantType
98
from pyhon.parameter.base import HonParameter
109
from pyhon.parameter.range import HonParameterRange
1110

@@ -26,7 +25,7 @@
2625

2726

2827
async def async_setup_entry(
29-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
28+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
3029
) -> None:
3130
entities = []
3231
for device in hass.data[DOMAIN][entry.unique_id]["hon"].appliances:

custom_components/hon/number.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
)
99
from homeassistant.config_entries import ConfigEntry
1010
from homeassistant.const import UnitOfTime, UnitOfTemperature
11-
from homeassistant.core import callback
11+
from homeassistant.core import callback, HomeAssistant
1212
from homeassistant.helpers.entity import EntityCategory
1313
from homeassistant.helpers.entity_platform import AddEntitiesCallback
14-
from homeassistant.helpers.typing import HomeAssistantType
1514
from pyhon.appliance import HonAppliance
1615
from pyhon.parameter.range import HonParameterRange
1716

@@ -207,7 +206,7 @@ class HonNumberEntityDescription(NumberEntityDescription):
207206

208207

209208
async def async_setup_entry(
210-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
209+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
211210
) -> None:
212211
entities = []
213212
entity: HonNumberEntity | HonConfigNumberEntity
@@ -230,7 +229,7 @@ class HonNumberEntity(HonEntity, NumberEntity):
230229

231230
def __init__(
232231
self,
233-
hass: HomeAssistantType,
232+
hass: HomeAssistant,
234233
entry: ConfigEntry,
235234
device: HonAppliance,
236235
description: HonNumberEntityDescription,
@@ -285,7 +284,7 @@ class HonConfigNumberEntity(HonEntity, NumberEntity):
285284

286285
def __init__(
287286
self,
288-
hass: HomeAssistantType,
287+
hass: HomeAssistant,
289288
entry: ConfigEntry,
290289
device: HonAppliance,
291290
description: HonConfigNumberEntityDescription,

custom_components/hon/select.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
from homeassistant.components.select import SelectEntity, SelectEntityDescription
77
from homeassistant.config_entries import ConfigEntry
88
from homeassistant.const import UnitOfTemperature, UnitOfTime, REVOLUTIONS_PER_MINUTE
9-
from homeassistant.core import callback
9+
from homeassistant.core import callback, HomeAssistant
1010
from homeassistant.helpers.entity import EntityCategory
1111
from homeassistant.helpers.entity_platform import AddEntitiesCallback
12-
from homeassistant.helpers.typing import HomeAssistantType
1312

1413
from . import const
1514
from .const import DOMAIN
@@ -211,7 +210,7 @@ class HonConfigSelectEntityDescription(SelectEntityDescription):
211210

212211

213212
async def async_setup_entry(
214-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
213+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
215214
) -> None:
216215
entities = []
217216
entity: HonSelectEntity | HonConfigSelectEntity

custom_components/hon/sensor.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
UnitOfTime,
2222
UnitOfTemperature,
2323
)
24-
from homeassistant.core import callback
24+
from homeassistant.core import callback, HomeAssistant
2525
from homeassistant.helpers.entity import EntityCategory
2626
from homeassistant.helpers.entity_platform import AddEntitiesCallback
27-
from homeassistant.helpers.typing import HomeAssistantType
2827

2928
from . import const
3029
from .const import DOMAIN
@@ -808,7 +807,7 @@ class HonSensorEntityDescription(SensorEntityDescription):
808807

809808

810809
async def async_setup_entry(
811-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
810+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
812811
) -> None:
813812
entities = []
814813
entity: HonSensorEntity | HonConfigSensorEntity

custom_components/hon/switch.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55

66
from homeassistant.components.switch import SwitchEntityDescription, SwitchEntity
77
from homeassistant.config_entries import ConfigEntry
8-
from homeassistant.core import callback
8+
from homeassistant.core import callback, HomeAssistant
99
from homeassistant.helpers.entity import EntityCategory
1010
from homeassistant.helpers.entity_platform import AddEntitiesCallback
11-
from homeassistant.helpers.typing import HomeAssistantType
1211
from pyhon.parameter.base import HonParameter
1312
from pyhon.parameter.range import HonParameterRange
1413

@@ -403,7 +402,7 @@ class HonConfigSwitchEntityDescription(SwitchEntityDescription):
403402

404403

405404
async def async_setup_entry(
406-
hass: HomeAssistantType, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
405+
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
407406
) -> None:
408407
entities = []
409408
entity: HonConfigSwitchEntity | HonControlSwitchEntity | HonSwitchEntity

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pyhOn @ git+https://github.com/IoTLabs-pl/pyhOn@v0.17.7
1+
pyhOn @ git+https://github.com/IoTLabs-pl/pyhOn@dev

0 commit comments

Comments
 (0)