Update byte string formatting (#112752)

pull/112760/head
Marc Mueller 2024-03-08 20:32:40 +01:00 committed by GitHub
parent 0e86f182cc
commit 959826c4b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 33 additions and 33 deletions

View File

@ -170,7 +170,7 @@ def read_init(bytes_io: BufferedIOBase) -> bytes:
ZERO32 = b"\x00\x00\x00\x00"
ONE32 = b"\x00\x01\x00\x00"
NEGONE32 = b"\xFF\xFF\x00\x00"
NEGONE32 = b"\xff\xff\x00\x00"
XYW_ROW = ZERO32 + ZERO32 + b"\x40\x00\x00\x00"
ROTATE_RIGHT = (ZERO32 + ONE32 + ZERO32) + (NEGONE32 + ZERO32 + ZERO32)
ROTATE_LEFT = (ZERO32 + NEGONE32 + ZERO32) + (ONE32 + ZERO32 + ZERO32)

View File

@ -59,7 +59,7 @@ WAVE_SERVICE_INFO = BluetoothServiceInfoBleak(
service_data={
# Sensor data
"b42e2a68-ade7-11e4-89d3-123b93f75cba": bytearray(
b"\x01\x02\x03\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0A"
b"\x01\x02\x03\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a"
),
# Manufacturer
"00002a29-0000-1000-8000-00805f9b34fb": bytearray(b"Airthings AS"),
@ -104,7 +104,7 @@ VIEW_PLUS_SERVICE_INFO = BluetoothServiceInfoBleak(
manufacturer_data={820: b"\xe4/\xa5\xae\t\x00"},
service_data={
"b42eb4a6-ade7-11e4-89d3-123b93f75cba": bytearray(
b"\x01\x02\x03\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0A"
b"\x01\x02\x03\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a"
),
# Manufacturer
"00002a29-0000-1000-8000-00805f9b34fb": bytearray(b"Airthings AS"),

View File

@ -68,7 +68,7 @@ _LOGGER = logging.getLogger(__name__)
"A4:C1:38:8D:18:B2",
make_bthome_v1_adv(
"A4:C1:38:8D:18:B2",
b"\x02\x0F\x01",
b"\x02\x0f\x01",
),
None,
[
@ -154,7 +154,7 @@ async def test_v1_binary_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x0F\x01",
b"\x40\x0f\x01",
),
None,
[

View File

@ -59,7 +59,7 @@ async def test_event_long_press(hass: HomeAssistant) -> None:
# Emit long press event
inject_bluetooth_service_info_bleak(
hass,
make_bthome_v2_adv(mac, b"\x40\x3A\x04"),
make_bthome_v2_adv(mac, b"\x40\x3a\x04"),
)
# wait for the event
@ -82,7 +82,7 @@ async def test_event_rotate_dimmer(hass: HomeAssistant) -> None:
# Emit rotate dimmer 3 steps left event
inject_bluetooth_service_info_bleak(
hass,
make_bthome_v2_adv(mac, b"\x40\x3C\x01\x03"),
make_bthome_v2_adv(mac, b"\x40\x3c\x01\x03"),
)
# wait for the event
@ -105,7 +105,7 @@ async def test_get_triggers_button(hass: HomeAssistant) -> None:
# Emit long press event so it creates the device in the registry
inject_bluetooth_service_info_bleak(
hass,
make_bthome_v2_adv(mac, b"\x40\x3A\x04"),
make_bthome_v2_adv(mac, b"\x40\x3a\x04"),
)
# wait for the event
@ -141,7 +141,7 @@ async def test_get_triggers_dimmer(hass: HomeAssistant) -> None:
# Emit rotate left with 3 steps event so it creates the device in the registry
inject_bluetooth_service_info_bleak(
hass,
make_bthome_v2_adv(mac, b"\x40\x3C\x01\x03"),
make_bthome_v2_adv(mac, b"\x40\x3c\x01\x03"),
)
# wait for the event
@ -237,7 +237,7 @@ async def test_if_fires_on_motion_detected(hass: HomeAssistant, calls) -> None:
# Emit a button event so it creates the device in the registry
inject_bluetooth_service_info_bleak(
hass,
make_bthome_v2_adv(mac, b"\x40\x3A\x03"),
make_bthome_v2_adv(mac, b"\x40\x3a\x03"),
)
# # wait for the event
@ -272,7 +272,7 @@ async def test_if_fires_on_motion_detected(hass: HomeAssistant, calls) -> None:
# Emit long press event
inject_bluetooth_service_info_bleak(
hass,
make_bthome_v2_adv(mac, b"\x40\x3A\x04"),
make_bthome_v2_adv(mac, b"\x40\x3a\x04"),
)
await hass.async_block_till_done()

View File

@ -23,7 +23,7 @@ from tests.components.bluetooth import (
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x3A\x00\x3A\x01\x3A\x03",
b"\x40\x3a\x00\x3a\x01\x3a\x03",
),
None,
[
@ -43,7 +43,7 @@ from tests.components.bluetooth import (
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x3A\x04",
b"\x40\x3a\x04",
),
None,
[

View File

@ -162,7 +162,7 @@ _LOGGER = logging.getLogger(__name__)
"A4:C1:38:8D:18:B2",
make_bthome_v1_adv(
"A4:C1:38:8D:18:B2",
b"\x23\x08\xCA\x06",
b"\x23\x08\xca\x06",
),
None,
[
@ -482,7 +482,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x06\x5E\x1F",
b"\x40\x06\x5e\x1f",
),
None,
[
@ -499,7 +499,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x07\x3E\x1d",
b"\x40\x07\x3e\x1d",
),
None,
[
@ -516,7 +516,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x08\xCA\x06",
b"\x40\x08\xca\x06",
),
None,
[
@ -677,7 +677,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x3F\x02\x0c",
b"\x40\x3f\x02\x0c",
),
None,
[
@ -694,7 +694,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x40\x0C\x00",
b"\x40\x40\x0c\x00",
),
None,
[
@ -711,7 +711,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x41\x4E\x00",
b"\x40\x41\x4e\x00",
),
None,
[
@ -728,7 +728,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x42\x4E\x34\x00",
b"\x40\x42\x4e\x34\x00",
),
None,
[
@ -745,7 +745,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x43\x4E\x34",
b"\x40\x43\x4e\x34",
),
None,
[
@ -762,7 +762,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x44\x4E\x34",
b"\x40\x44\x4e\x34",
),
None,
[
@ -829,7 +829,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x48\xDC\x87",
b"\x40\x48\xdc\x87",
),
None,
[
@ -846,7 +846,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x40\x49\xDC\x87",
b"\x40\x49\xdc\x87",
),
None,
[
@ -863,7 +863,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x44\x50\x5D\x39\x61\x64",
b"\x44\x50\x5d\x39\x61\x64",
),
None,
[
@ -947,7 +947,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x44\x53\x0C\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x21",
b"\x44\x53\x0c\x48\x65\x6c\x6c\x6f\x20\x57\x6f\x72\x6c\x64\x21",
),
None,
[
@ -962,7 +962,7 @@ async def test_v1_sensors(
"A4:C1:38:8D:18:B2",
make_bthome_v2_adv(
"A4:C1:38:8D:18:B2",
b"\x44\x54\x0C\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x21",
b"\x44\x54\x0c\x48\x65\x6c\x6c\x6f\x20\x57\x6f\x72\x6c\x64\x21",
),
None,
[

View File

@ -748,11 +748,11 @@ def test_validate_topic() -> None:
with pytest.raises(vol.Invalid):
mqtt.util.valid_topic("\u0001")
with pytest.raises(vol.Invalid):
mqtt.util.valid_topic("\u001F")
mqtt.util.valid_topic("\u001f")
with pytest.raises(vol.Invalid):
mqtt.util.valid_topic("\u007F")
mqtt.util.valid_topic("\u007f")
with pytest.raises(vol.Invalid):
mqtt.util.valid_topic("\u009F")
mqtt.util.valid_topic("\u009f")
with pytest.raises(vol.Invalid):
mqtt.util.valid_topic("\ufdd0")
with pytest.raises(vol.Invalid):
@ -2723,7 +2723,7 @@ async def test_mqtt_ws_subscription(
async_fire_mqtt_message(hass, "test-topic", "test1")
async_fire_mqtt_message(hass, "test-topic", "test2")
async_fire_mqtt_message(hass, "test-topic", b"\xDE\xAD\xBE\xEF")
async_fire_mqtt_message(hass, "test-topic", b"\xde\xad\xbe\xef")
response = await client.receive_json()
assert response["event"]["topic"] == "test-topic"
@ -2751,7 +2751,7 @@ async def test_mqtt_ws_subscription(
async_fire_mqtt_message(hass, "test-topic", "test1", 2)
async_fire_mqtt_message(hass, "test-topic", "test2", 2)
async_fire_mqtt_message(hass, "test-topic", b"\xDE\xAD\xBE\xEF", 2)
async_fire_mqtt_message(hass, "test-topic", b"\xde\xad\xbe\xef", 2)
response = await client.receive_json()
assert response["event"]["topic"] == "test-topic"