Skip to content

Commit 07e835b

Browse files
authored
Replace ByteString (#4119)
1 parent 5f1f14b commit 07e835b

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

tests/test_tuya_builder.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"""Tests for TuyaQuirkBuilder."""
22

3-
from collections.abc import ByteString
43
import datetime
54
from unittest import mock
65

@@ -166,13 +165,13 @@ class ModTuyaMCUCluster(TuyaMCUCluster):
166165
class Tuya3PhaseElectricalMeasurement(ElectricalMeasurement, TuyaLocalCluster):
167166
"""Tuya Electrical Measurement cluster."""
168167

169-
def dpToPower(data: ByteString) -> int:
168+
def dpToPower(data: bytes) -> int:
170169
return data[0]
171170

172-
def dpToCurrent(data: ByteString) -> int:
171+
def dpToCurrent(data: bytes) -> int:
173172
return data[1]
174173

175-
def dpToVoltage(data: ByteString) -> int:
174+
def dpToVoltage(data: bytes) -> int:
176175
return data[2]
177176

178177
entry = (

zhaquirks/tuya/ts0601_power.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
"""Tuya Power Meter."""
22

3-
from collections.abc import ByteString
4-
53
from zigpy.quirks.v2 import EntityType, SensorDeviceClass, SensorStateClass
64
from zigpy.quirks.v2.homeassistant import (
75
PERCENTAGE,
@@ -18,7 +16,7 @@
1816
from zhaquirks.tuya.builder import TuyaQuirkBuilder
1917

2018

21-
def dp_to_power(data: ByteString) -> int:
19+
def dp_to_power(data: bytes) -> int:
2220
"""Convert DP data to power value."""
2321
# From https://github.com/Koenkk/zigbee2mqtt/issues/18603#issuecomment-2277697295
2422
power = int(data)
@@ -27,7 +25,7 @@ def dp_to_power(data: ByteString) -> int:
2725
return power
2826

2927

30-
def multi_dp_to_power(data: ByteString) -> int:
28+
def multi_dp_to_power(data: bytes) -> int:
3129
"""Convert DP data to power value."""
3230
# Support negative power readings
3331
# From https://github.com/Koenkk/zigbee2mqtt/issues/18603#issuecomment-2277697295
@@ -37,12 +35,12 @@ def multi_dp_to_power(data: ByteString) -> int:
3735
return power
3836

3937

40-
def multi_dp_to_current(data: ByteString) -> int:
38+
def multi_dp_to_current(data: bytes) -> int:
4139
"""Convert DP data to current value."""
4240
return data[4] | (data[3] << 8)
4341

4442

45-
def multi_dp_to_voltage(data: ByteString) -> int:
43+
def multi_dp_to_voltage(data: bytes) -> int:
4644
"""Convert DP data to voltage value."""
4745
return data[1] | (data[0] << 8)
4846

0 commit comments

Comments
 (0)