Skip to content

Commit 253755b

Browse files
authored
Merge pull request #1353 from custom-components/fix_helper_ref
remove direct refs to homeassistant.helpers
2 parents af07174 + 775a889 commit 253755b

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

.github/workflows/test_commit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup Python
3131
uses: "actions/setup-python@v5"
3232
with:
33-
python-version: "3.11"
33+
python-version: "3.12"
3434
- name: Install requirements
3535
run: python3 -m pip install -r requirements_test.txt
3636
- name: Run pytest

custom_components/ble_monitor/__init__.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
CONF_UNIQUE_ID, EVENT_HOMEASSISTANT_STOP)
1515
from homeassistant.core import HomeAssistant
1616
from homeassistant.helpers import config_validation as cv
17-
from homeassistant.helpers.entity_registry import async_entries_for_device
17+
from homeassistant.helpers import device_registry, entity_registry
1818
from homeassistant.util import dt
1919

2020
from .ble_parser import BleParser
@@ -400,20 +400,20 @@ async def async_cleanup_entries_service(hass: HomeAssistant, service_data):
400400
"""Remove orphaned entries from device and entity registries."""
401401
_LOGGER.debug("async_cleanup_entries_service")
402402

403-
entity_registry = hass.helpers.entity_registry.async_get(hass)
404-
device_registry = hass.helpers.device_registry.async_get(hass)
403+
ent_registry = entity_registry.async_get(hass)
404+
dev_registry = device_registry.async_get(hass)
405405
config_entry_id = hass.data[DOMAIN]["config_entry_id"]
406406

407407
devices_to_be_removed = [
408408
entry.id
409-
for entry in device_registry.devices.values()
409+
for entry in dev_registry.devices.values()
410410
if config_entry_id in entry.config_entries
411411
]
412412

413413
# Remove devices that don't belong to any entity
414414
for device_id in devices_to_be_removed:
415-
if len(async_entries_for_device(entity_registry, device_id)) == 0:
416-
device_registry.async_remove_device(device_id)
415+
if len(ent_registry.async_entries_for_device(ent_registry, device_id)) == 0:
416+
dev_registry.async_remove_device(device_id)
417417
_LOGGER.debug("device %s will be deleted", device_id)
418418

419419

custom_components/ble_monitor/binary_sensor.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from homeassistant.const import (ATTR_BATTERY_LEVEL, CONF_DEVICES, CONF_MAC,
88
CONF_NAME, CONF_UNIQUE_ID, STATE_OFF,
99
STATE_ON)
10+
from homeassistant.helpers import device_registry, entity_registry
1011
from homeassistant.helpers.event import async_call_later
1112
from homeassistant.helpers.restore_state import RestoreEntity
1213
from homeassistant.util import dt
@@ -131,8 +132,8 @@ async def async_add_binary_sensor(key, device_model, firmware, auto_sensors, man
131132

132133
# Set up binary sensors of configured devices on startup when device model is available in device registry
133134
if self.config[CONF_DEVICES]:
134-
dev_registry = hass.helpers.device_registry.async_get(hass)
135-
ent_registry = hass.helpers.entity_registry.async_get(hass)
135+
dev_registry = device_registry.async_get(hass)
136+
ent_registry = entity_registry.async_get(hass)
136137
for device in self.config[CONF_DEVICES]:
137138
# get device_model and firmware from device registry to setup binary sensor
138139
key = dict_get_or(device)
@@ -149,7 +150,7 @@ async def async_add_binary_sensor(key, device_model, firmware, auto_sensors, man
149150
firmware = RENAMED_FIRMWARE_DICT.get(firmware, firmware)
150151
manufacturer = RENAMED_MANUFACTURER_DICT.get(manufacturer, manufacturer)
151152
# get all entities for this device
152-
entity_list = hass.helpers.entity_registry.async_entries_for_device(
153+
entity_list = entity_registry.async_entries_for_device(
153154
registry=ent_registry, device_id=device_id, include_disabled_entities=False
154155
)
155156
# find the measurement key for each entity

custom_components/ble_monitor/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
"btsocket>=0.2.0",
1515
"pyric>=0.1.6.3"
1616
],
17-
"version": "12.10.4"
17+
"version": "12.11.1-beta"
1818
}

custom_components/ble_monitor/sensor.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from homeassistant.const import (ATTR_BATTERY_LEVEL, CONF_DEVICES, CONF_MAC,
99
CONF_NAME, CONF_TEMPERATURE_UNIT,
1010
CONF_UNIQUE_ID, UnitOfMass, UnitOfTemperature)
11+
from homeassistant.helpers import device_registry, entity_registry
1112
from homeassistant.helpers.event import async_call_later
1213
from homeassistant.helpers.typing import StateType
1314
from homeassistant.util import dt
@@ -140,8 +141,8 @@ async def async_add_sensor(key, device_model, firmware, auto_sensors, manufactur
140141

141142
# setup sensors of configured devices on startup when device model is available in registry
142143
if self.config[CONF_DEVICES]:
143-
dev_registry = hass.helpers.device_registry.async_get(hass)
144-
ent_registry = hass.helpers.entity_registry.async_get(hass)
144+
dev_registry = device_registry.async_get(hass)
145+
ent_registry = entity_registry.async_get(hass)
145146
for device in self.config[CONF_DEVICES]:
146147
# get device_model and firmware from device registry to setup sensor
147148
key = dict_get_or(device)
@@ -158,7 +159,7 @@ async def async_add_sensor(key, device_model, firmware, auto_sensors, manufactur
158159
firmware = RENAMED_FIRMWARE_DICT.get(firmware, firmware)
159160
manufacturer = RENAMED_MANUFACTURER_DICT.get(manufacturer, manufacturer)
160161
# get all entities for this device
161-
entity_list = hass.helpers.entity_registry.async_entries_for_device(
162+
entity_list = entity_registry.async_entries_for_device(
162163
registry=ent_registry, device_id=device_id, include_disabled_entities=False
163164
)
164165
# find the measurement key for each entity

requirements_test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pytest-homeassistant-custom-component==0.13.109
1+
pytest-homeassistant-custom-component==0.13.119
22

33
# BLE montitor requirements
44
pycryptodomex==3.19.1

0 commit comments

Comments
 (0)