From 2311a84339473b299292369eb2c8abd2e913ed4b Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Mon, 17 Jul 2023 00:28:44 +0300 Subject: [PATCH] Use f-strings for formatting Fixes Ruff warnings. Ruff didn't detect these before. Should we pin Ruff version? :thinking: --- test/duplicate-check.py | 6 +----- tools/ratbagctl.body.py.in | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/test/duplicate-check.py b/test/duplicate-check.py index f6c734e3..b87faad3 100755 --- a/test/duplicate-check.py +++ b/test/duplicate-check.py @@ -50,11 +50,7 @@ if __name__ == "__main__": fname = os.path.basename(path) for m in matches: if m in device_matches: - print( - "Duplicate DeviceMatch={} in {} and {}".format( - m, fname, device_matches[m] - ) - ) + print(f"Duplicate DeviceMatch={m} in {fname} and {device_matches[m]}") duplicates = True device_matches[m] = fname diff --git a/tools/ratbagctl.body.py.in b/tools/ratbagctl.body.py.in index fb7758f0..622c18c4 100755 --- a/tools/ratbagctl.body.py.in +++ b/tools/ratbagctl.body.py.in @@ -321,9 +321,7 @@ def show_profile(ratbagd: Ratbagd, args: argparse.Namespace) -> None: def show_resolution(ratbagd: Ratbagd, args: argparse.Namespace) -> None: resolution, p, d = find_resolution(ratbagd, args) print( - "Resolution {} on Profile {} on {} ({})".format( - args.resolution, args.profile, d.id, d.name - ) + f"Resolution {args.resolution} on Profile {args.profile} on {d.id} ({d.name})" ) print_resolution(d, p, resolution, 0) caps = { @@ -337,9 +335,7 @@ def show_resolution(ratbagd: Ratbagd, args: argparse.Namespace) -> None: def show_button(ratbagd: Ratbagd, args: argparse.Namespace) -> None: button, profile, device = find_button(ratbagd, args) print( - "Button {} on Profile {} on {} ({})".format( - args.button, args.profile, device.id, device.name - ) + f"Button {args.button} on Profile {args.profile} on {device.id} ({device.name})" ) print_button(device, profile, button, 0)