Upstream/aioesphomeapi
1
0
Fork 0
mirror of https://github.com/esphome/aioesphomeapi.git synced 2024-11-27 12:55:32 +01:00
Code Issues Projects Releases Wiki Activity

Use explict type checks for protobuf messages (#774)

Browse Source
This commit is contained in:
J. Nick Koston 2023-11-28 08:33:06 -06:00 committed by GitHub
parent 7c7bdfc585
commit d0aaf25577
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aioesphomeapi/client.py
View File

@ -392,10 +392,10 @@ class APIClient:
msg_types = LIST_ENTITIES_MSG_TYPES msg_types = LIST_ENTITIES_MSG_TYPES
def do_append(msg: message.Message) -> bool: def do_append(msg: message.Message) -> bool:
return not isinstance(msg, ListEntitiesDoneResponse) return type(msg) is not ListEntitiesDoneResponse
def do_stop(msg: message.Message) -> bool: def do_stop(msg: message.Message) -> bool:
return isinstance(msg, ListEntitiesDoneResponse) return type(msg) is ListEntitiesDoneResponse
resp = await self._get_connection().send_messages_await_response_complex( resp = await self._get_connection().send_messages_await_response_complex(
(ListEntitiesRequest(),), do_append, do_stop, msg_types, 60 (ListEntitiesRequest(),), do_append, do_stop, msg_types, 60
@ -403,7 +403,7 @@ class APIClient:
entities: list[EntityInfo] = [] entities: list[EntityInfo] = []
services: list[UserService] = [] services: list[UserService] = []
for msg in resp: for msg in resp:
if isinstance(msg, ListEntitiesServicesResponse): if type(msg) is ListEntitiesServicesResponse:
services.append(UserService.from_pb(msg)) services.append(UserService.from_pb(msg))
continue continue
cls = response_types[type(msg)] cls = response_types[type(msg)]
@ -769,7 +769,7 @@ class APIClient:
services = [] services = []
for msg in resp: for msg in resp:
self._raise_for_ble_connection_change(address, msg, msg_types) self._raise_for_ble_connection_change(address, msg, msg_types)
if isinstance(msg, BluetoothGATTErrorResponse): if type(msg) is BluetoothGATTErrorResponse:
raise BluetoothGATTAPIError(BluetoothGATTError.from_pb(msg)) raise BluetoothGATTAPIError(BluetoothGATTError.from_pb(msg))
services.extend(BluetoothGATTServices.from_pb(msg).services) services.extend(BluetoothGATTServices.from_pb(msg).services)