starred/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2026-10-05 21:57:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various string cleanups (#30435)

Browse Source 
* Remove some unnecessary string concatenations

* Replace some simple str.formats with f-strings

* Replace some string concatenations with f-strings
This commit is contained in:
Ville Skyttä
2020-01-03 14:47:06 +01:00
committed by Paulus Schoutsen
parent 5ad209c6fd
commit fa4fa30461
105 changed files with 241 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/components/zwave/test_init.py
+9 -9
View File
@@ -459,18 +459,18 @@ async def test_value_entities(hass, mock_openzwave):
entry = ent_reg.async_get("zwave.mock_node")
assert entry is not None
assert entry.unique_id == "node-{}".format(node.node_id)
assert entry.unique_id == f"node-{node.node_id}"
node_dev_id = entry.device_id
entry = ent_reg.async_get("binary_sensor.mock_node_mock_value")
assert entry is not None
assert entry.unique_id == "{}-{}".format(node.node_id, value.object_id)
assert entry.unique_id == f"{node.node_id}-{value.object_id}"
assert entry.name is None
assert entry.device_id == node_dev_id
entry = ent_reg.async_get("binary_sensor.mock_node_mock_value_b")
assert entry is not None
assert entry.unique_id == "{}-{}".format(node.node_id, value2.object_id)
assert entry.unique_id == f"{node.node_id}-{value2.object_id}"
assert entry.name is None
assert entry.device_id != node_dev_id
device_id_b = entry.device_id
@@ -482,7 +482,7 @@ async def test_value_entities(hass, mock_openzwave):
device = dev_reg.async_get(device_id_b)
assert device is not None
assert device.name == "{} ({})".format(node.name, value2.instance)
assert device.name == f"{node.name} ({value2.instance})"
# test renaming without updating
await hass.services.async_call(
@@ -510,7 +510,7 @@ async def test_value_entities(hass, mock_openzwave):
device = dev_reg.async_get(device_id_b)
assert device is not None
assert device.name == "{} ({})".format(node.name, value2.instance)
assert device.name == f"{node.name} ({value2.instance})"
# test renaming
await hass.services.async_call(
@@ -528,11 +528,11 @@ async def test_value_entities(hass, mock_openzwave):
entry = ent_reg.async_get("zwave.new_node")
assert entry is not None
assert entry.unique_id == "node-{}".format(node.node_id)
assert entry.unique_id == f"node-{node.node_id}"
entry = ent_reg.async_get("binary_sensor.new_node_mock_value")
assert entry is not None
assert entry.unique_id == "{}-{}".format(node.node_id, value.object_id)
assert entry.unique_id == f"{node.node_id}-{value.object_id}"
device = dev_reg.async_get(node_dev_id)
assert device is not None
@@ -541,7 +541,7 @@ async def test_value_entities(hass, mock_openzwave):
device = dev_reg.async_get(device_id_b)
assert device is not None
assert device.name == "{} ({})".format(node.name, value2.instance)
assert device.name == f"{node.name} ({value2.instance})"
await hass.services.async_call(
"zwave",
@@ -557,7 +557,7 @@ async def test_value_entities(hass, mock_openzwave):
entry = ent_reg.async_get("binary_sensor.new_node_new_label")
assert entry is not None
assert entry.unique_id == "{}-{}".format(node.node_id, value.object_id)
assert entry.unique_id == f"{node.node_id}-{value.object_id}"
async def test_value_discovery_existing_entity(hass, mock_openzwave):