diff --git a/changelogs/fragments/11231-perc-format.yml b/changelogs/fragments/11231-perc-format.yml new file mode 100644 index 0000000000..2d48156fab --- /dev/null +++ b/changelogs/fragments/11231-perc-format.yml @@ -0,0 +1,3 @@ +minor_changes: + - oneandone_server - replace ``%`` templating with f-strings or ``format()`` (https://github.com/ansible-collections/community.general/pull/11231). + - packet_device - replace ``%`` templating with f-strings or ``format()`` (https://github.com/ansible-collections/community.general/pull/11231). diff --git a/plugins/modules/oneandone_server.py b/plugins/modules/oneandone_server.py index 0d54997f35..e3c37570ff 100644 --- a/plugins/modules/oneandone_server.py +++ b/plugins/modules/oneandone_server.py @@ -553,7 +553,7 @@ def _auto_increment_hostname(count, hostname): name-02, name-03, and so forth. """ if "%" not in hostname: - hostname = "%s-%%01d" % hostname # noqa + hostname = f"{hostname}-%01d" return [hostname % i for i in range(1, count + 1)] diff --git a/plugins/modules/packet_device.py b/plugins/modules/packet_device.py index eeb3f48fc2..0a73833163 100644 --- a/plugins/modules/packet_device.py +++ b/plugins/modules/packet_device.py @@ -423,8 +423,7 @@ def get_hostname_list(module): if re.search(r"%\d{0,2}d", hostname_spec): hostnames = [hostname_spec % i for i in count_range] elif count > 1: - hostname_spec = "%s%%02d" % hostname_spec # noqa - hostnames = [hostname_spec % i for i in count_range] + hostnames = [f"{hostname_spec}{i:02}" for i in count_range] for hn in hostnames: if not is_valid_hostname(hn): @@ -500,9 +499,8 @@ def wait_for_devices_active(module, packet_conn, watched_devices): if all(d.state == "active" for d in refreshed): return refreshed time.sleep(5) - raise Exception( - 'Waiting for state "active" timed out for devices: %s' % [d.hostname for d in refreshed if d.state != "active"] - ) + timed_out_devices = [d.hostname for d in refreshed if d.state != "active"] + raise Exception(f'Waiting for state "active" timed out for devices: {timed_out_devices}') def wait_for_public_IPv(module, packet_conn, created_devices):