From 2969f3b7a5bf333cef2ff498bbbfa2ca97f05673 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@wuttaproject.org>
Date: Sat, 30 Aug 2025 19:29:52 -0500
Subject: [PATCH] fix: fix 'consider-using-f-string' for pylint

---
 .pylintrc                   |  1 +
 src/wuttjamaican/db/util.py |  4 ++--
 src/wuttjamaican/install.py | 11 +++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 6faf62c..9b337d7 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -7,6 +7,7 @@ enable=anomalous-backslash-in-string,
         assignment-from-none,
         bare-except,
         broad-exception-caught,
+        consider-using-f-string,
         dangerous-default-value,
         disallowed-name,
         empty-docstring,
diff --git a/src/wuttjamaican/db/util.py b/src/wuttjamaican/db/util.py
index bf1f117..afc29b1 100644
--- a/src/wuttjamaican/db/util.py
+++ b/src/wuttjamaican/db/util.py
@@ -99,10 +99,10 @@ class UUID(sa.types.TypeDecorator):
             return str(value)
 
         if not isinstance(value, _uuid.UUID):
-            return "%.32x" % _uuid.UUID(value).int
+            value = _uuid.UUID(value)
 
         # hexstring
-        return "%.32x" % value.int
+        return f"{value.int:032x}"
 
     def process_result_value(self, value, dialect): # pylint: disable=unused-argument,empty-docstring
         """ """
diff --git a/src/wuttjamaican/install.py b/src/wuttjamaican/install.py
index 9a59413..5ac007e 100644
--- a/src/wuttjamaican/install.py
+++ b/src/wuttjamaican/install.py
@@ -141,7 +141,7 @@ class InstallHandler(GenericHandler):
 
         This is normally called by :meth:`run()`.
         """
-        self.rprint("\n\t[blue]Welcome to {}![/blue]".format(self.app.get_title()))
+        self.rprint(f"\n\t[blue]Welcome to {self.app.get_title()}![/blue]")
         self.rprint("\n\tThis tool will install and configure the app.")
         self.rprint("\n\t[italic]NB. You should already have created the database in PostgreSQL or MySQL.[/italic]")
 
@@ -221,7 +221,7 @@ class InstallHandler(GenericHandler):
         error = self.test_db_connection(dbinfo['dburl'])
         if error:
             self.rprint("[bold red]cannot connect![/bold red] ..error was:")
-            self.rprint("\n{}".format(error))
+            self.rprint(f"\n{error}")
             self.rprint("\n\t[bold yellow]aborting mission[/bold yellow]\n")
             sys.exit(1)
         self.rprint("[bold green]good[/bold green]")
@@ -446,8 +446,7 @@ class InstallHandler(GenericHandler):
                'upgrade', 'heads']
         subprocess.check_call(cmd)
 
-        self.rprint("\n\tdb schema installed to:  [bold green]{}[/bold green]".format(
-            obfuscate_url_pw(db_url)))
+        self.rprint(f"\n\tdb schema installed to:  [bold green]{obfuscate_url_pw(db_url)}[/bold green]")
         return True
 
     def show_goodbye(self):
@@ -540,9 +539,9 @@ class InstallHandler(GenericHandler):
         ]
         if default is not None:
             if is_bool:
-                message.append(('', ' [{}]: '.format('Y' if default else 'N')))
+                message.append(('', f' [{"Y" if default else "N"}]: '))
             else:
-                message.append(('', ' [{}]: '.format(default)))
+                message.append(('', f' [{default}]: '))
         else:
             message.append(('', ': '))