Improve string formatting v5 (#33697)

* Improve string formatting v5

* Address review comments
This commit is contained in:
springstan authored and GitHub committed 2020-04-05 17:48:55 +02:00
1 parent 39336d3ea3
commit fca90a8ddc
46 files changed
+221 -252

No files matched your search

+2 -4
View File
@@ -261,7 +261,7 @@ def _obj_to_dict(obj):
def _value_name(value):
"""Return the name of the value."""
return "{} {}".format(node_name(value.node), value.label).strip()
return f"{node_name(value.node)} {value.label}".strip()
def nice_print_node(node):
@@ -826,9 +826,7 @@ async def async_setup_entry(hass, config_entry):
)
return
_LOGGER.info(
"Node %s on instance %s does not have resettable meters.",
node_id,
instance,
"Node %s on instance %s does not have resettable meters.", node_id, instance
)
def heal_node(service):
+8 -9
View File
@@ -337,21 +337,20 @@ class ZwaveLock(ZWaveDeviceEntity, LockDevice):
)
if alarm_type == 21:
self._lock_status = "{}{}".format(
LOCK_ALARM_TYPE.get(str(alarm_type)),
MANUAL_LOCK_ALARM_LEVEL.get(str(alarm_level)),
self._lock_status = (
f"{LOCK_ALARM_TYPE.get(str(alarm_type))}"
f"{MANUAL_LOCK_ALARM_LEVEL.get(str(alarm_level))}"
)
return
if str(alarm_type) in ALARM_TYPE_STD:
self._lock_status = "{}{}".format(
LOCK_ALARM_TYPE.get(str(alarm_type)), str(alarm_level)
)
self._lock_status = f"{LOCK_ALARM_TYPE.get(str(alarm_type))}{alarm_level}"
return
if alarm_type == 161:
self._lock_status = "{}{}".format(
LOCK_ALARM_TYPE.get(str(alarm_type)),
TAMPER_ALARM_LEVEL.get(str(alarm_level)),
self._lock_status = (
f"{LOCK_ALARM_TYPE.get(str(alarm_type))}"
f"{TAMPER_ALARM_LEVEL.get(str(alarm_level))}"
)
return
if alarm_type != 0:
self._lock_status = LOCK_ALARM_TYPE.get(str(alarm_type))