further f string updates

This commit is contained in:
Blake Harnden 2019-10-17 19:25:52 -07:00
parent c9326b6a97
commit 79cde8cd59
11 changed files with 21 additions and 55 deletions

View file

@ -29,7 +29,7 @@ from core.nodes.ipaddress import Ipv4Prefix
def dict_to_str(values):
return "|".join("%s=%s" % (x, values[x]) for x in values)
return "|".join(f"{x}={values[x]}" for x in values)
class TestGui:
@ -383,7 +383,7 @@ class TestGui:
message = coreapi.CoreFileMessage.create(
MessageFlags.ADD.value,
[
(FileTlvs.TYPE, "hook:%s" % state),
(FileTlvs.TYPE, f"hook:{state}"),
(FileTlvs.NAME, file_name),
(FileTlvs.DATA, file_data),
],
@ -406,7 +406,7 @@ class TestGui:
MessageFlags.ADD.value,
[
(FileTlvs.NODE, node.id),
(FileTlvs.TYPE, "service:%s" % service),
(FileTlvs.TYPE, f"service:{service}"),
(FileTlvs.NAME, file_name),
(FileTlvs.DATA, file_data),
],
@ -760,7 +760,7 @@ class TestGui:
[
(ConfigTlvs.OBJECT, "broker"),
(ConfigTlvs.TYPE, ConfigFlags.UPDATE.value),
(ConfigTlvs.VALUES, "%s:%s:%s" % (server, host, port)),
(ConfigTlvs.VALUES, f"{server}:{host}:{port}"),
],
)
coreserver.session.distributed.add_server = mock.MagicMock()
@ -844,7 +844,7 @@ class TestGui:
(ConfigTlvs.NODE, node.id),
(ConfigTlvs.OBJECT, "services"),
(ConfigTlvs.TYPE, ConfigFlags.UPDATE.value),
(ConfigTlvs.OPAQUE, "service:%s" % service),
(ConfigTlvs.OPAQUE, f"service:{service}"),
(ConfigTlvs.VALUES, dict_to_str(values)),
],
)