Update string formatting to use f-string on core codebase (#125988)
* Update string formatting to use f-string on core codebase * Small change given review feedbackpull/126269/head
parent
7ba9d1fe65
commit
28ece89272
|
@ -151,11 +151,11 @@ def _format_err[*_Ts](
|
|||
*args: Any,
|
||||
) -> str:
|
||||
"""Format error message."""
|
||||
return "Exception in {} when dispatching '{}': {}".format(
|
||||
|
||||
return (
|
||||
# Functions wrapped in partial do not have a __name__
|
||||
getattr(target, "__name__", None) or str(target),
|
||||
signal,
|
||||
args,
|
||||
f"Exception in {getattr(target, "__name__", None) or target} "
|
||||
f"when dispatching '{signal}': {args}"
|
||||
)
|
||||
|
||||
|
||||
|
|
|
@ -196,8 +196,8 @@ def async_create_catching_coro[_T](
|
|||
trace = traceback.extract_stack()
|
||||
return catch_log_coro_exception(
|
||||
target,
|
||||
lambda: "Exception in {} called from\n {}".format(
|
||||
target.__name__,
|
||||
"".join(traceback.format_list(trace[:-1])),
|
||||
lambda: (
|
||||
f"Exception in {target.__name__} called from\n"
|
||||
+ "".join(traceback.format_list(trace[:-1]))
|
||||
),
|
||||
)
|
||||
|
|
|
@ -57,7 +57,9 @@ def main():
|
|||
)
|
||||
|
||||
for key in sorted(msg):
|
||||
print("\n{}\n - {}".format(key, "\n - ".join(msg[key])))
|
||||
print(f"\n{key}")
|
||||
for val in msg[key]:
|
||||
print(f" - {val}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
@ -109,14 +109,16 @@ async def test_if_fires_on_state_change(
|
|||
hass.states.async_set("NEW_DOMAIN.entity", STATE_ON)
|
||||
await hass.async_block_till_done()
|
||||
assert len(service_calls) == 1
|
||||
assert service_calls[0].data[
|
||||
"some"
|
||||
] == "turn_on - device - {} - off - on - None - 0".format("NEW_DOMAIN.entity")
|
||||
assert (
|
||||
service_calls[0].data["some"]
|
||||
== "turn_on - device - NEW_DOMAIN.entity - off - on - None - 0"
|
||||
)
|
||||
|
||||
# Fake that the entity is turning off.
|
||||
hass.states.async_set("NEW_DOMAIN.entity", STATE_OFF)
|
||||
await hass.async_block_till_done()
|
||||
assert len(service_calls) == 2
|
||||
assert service_calls[1].data[
|
||||
"some"
|
||||
] == "turn_off - device - {} - on - off - None - 0".format("NEW_DOMAIN.entity")
|
||||
assert (
|
||||
service_calls[1].data["some"]
|
||||
== "turn_off - device - NEW_DOMAIN.entity - on - off - None - 0"
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue