From b3e722818962b321d5a0f5f2f58b53a9a006e054 Mon Sep 17 00:00:00 2001 From: Timo Ludwig Date: Fri, 5 Nov 2021 22:24:23 +0100 Subject: [PATCH] Convert regular format strings to f-strings This fixes the 'consider-using-f-string' pylint warnings --- src/bumpver/v2patterns.py | 16 ++++++++-------- test/test_cli.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/bumpver/v2patterns.py b/src/bumpver/v2patterns.py index e9a780e..88b9c1b 100644 --- a/src/bumpver/v2patterns.py +++ b/src/bumpver/v2patterns.py @@ -149,7 +149,7 @@ def _fmt_yy(year_y: FieldValue) -> str: def _fmt_0y(year_y: FieldValue) -> str: - return "{0:02}".format(int(str(year_y)[-2:])) + return f"{int(str(year_y)[-2:]):02}" def _fmt_gg(year_g: FieldValue) -> str: @@ -157,31 +157,31 @@ def _fmt_gg(year_g: FieldValue) -> str: def _fmt_0g(year_g: FieldValue) -> str: - return "{0:02}".format(int(str(year_g)[-2:])) + return f"{int(str(year_g)[-2:]):02}" def _fmt_0m(month: FieldValue) -> str: - return "{0:02}".format(int(month)) + return f"{int(month):02}" def _fmt_0d(dom: FieldValue) -> str: - return "{0:02}".format(int(dom)) + return f"{int(dom):02}" def _fmt_00j(doy: FieldValue) -> str: - return "{0:03}".format(int(doy)) + return f"{int(doy):03}" def _fmt_0w(week_w: FieldValue) -> str: - return "{0:02}".format(int(week_w)) + return f"{int(week_w):02}" def _fmt_0u(week_u: FieldValue) -> str: - return "{0:02}".format(int(week_u)) + return f"{int(week_u):02}" def _fmt_0v(week_v: FieldValue) -> str: - return "{0:02}".format(int(week_v)) + return f"{int(week_v):02}" FormatterFunc = typ.Callable[[FieldValue], str] diff --git a/test/test_cli.py b/test/test_cli.py index 8187ec6..963068b 100644 --- a/test/test_cli.py +++ b/test/test_cli.py @@ -276,9 +276,9 @@ def _update_config_val(filename, **kwargs): new_cfg_text = old_cfg_text for key, val in kwargs.items(): - replacement = "{} = {}".format(key, val) + replacement = f"{key} = {val}" if replacement not in new_cfg_text: - pattern = r"^{} = .*$".format(key) + pattern = fr"^{key} = .*$" new_cfg_text = re.sub(pattern, replacement, new_cfg_text, flags=re.MULTILINE) assert old_cfg_text != new_cfg_text