Replace slightly more advanced attempts to use format calls

Author: snejus

CONTRIBUTING.rst

@@ -246,8 +246,7 @@ There are a few coding conventions we use in beets:
    .. code-block:: python
 
        with g.lib.transaction() as tx:
-             rows = tx.query("SELECT DISTINCT '{0}' FROM '{1}' ORDER BY '{2}'"
-                             .format(field, model._table, sort_field))
+             rows = tx.query(f"SELECT DISTINCT {field} FROM {model._table} ORDER BY {sort_field}")
 
    To fetch Item objects from the database, use lib.items(…) and supply
    a query as an argument. Resist the urge to write raw SQL for your
@@ -261,7 +260,8 @@ There are a few coding conventions we use in beets:
 
    Transaction objects help control concurrent access to the database
    and assist in debugging conflicting accesses.
--  ``str.format()`` should be used instead of the ``%`` operator
+-  f-strings should be used instead of the ``%`` operator and ``str.format()``
+   calls.
 -  Never ``print`` informational messages; use the
    `logging <http://docs.python.org/library/logging.html>`__ module
    instead. In particular, we have our own logging shim, so you’ll see

beets/dbcore/query.py

@@ -848,20 +848,18 @@ def match(self, obj: Model) -> bool:
         date = datetime.fromtimestamp(timestamp)
         return self.interval.contains(date)
 
-    _clause_tmpl = "{0} {1} ?"
-
     def col_clause(self) -> tuple[str, Sequence[SQLiteType]]:
         clause_parts = []
         subvals = []
 
         # Convert the `datetime` objects to an integer number of seconds since
         # the (local) Unix epoch using `datetime.timestamp()`.
         if self.interval.start:
-            clause_parts.append(self._clause_tmpl.format(self.field, ">="))
+            clause_parts.append(f"{self.field} >= ?")
             subvals.append(int(self.interval.start.timestamp()))
 
         if self.interval.end:
-            clause_parts.append(self._clause_tmpl.format(self.field, "<"))
+            clause_parts.append(f"{self.field} < ?")
             subvals.append(int(self.interval.end.timestamp()))
 
         if clause_parts:

beets/dbcore/types.py

@@ -194,7 +194,7 @@ def __init__(self, digits: int):
         self.digits = digits
 
     def format(self, value: int | N) -> str:
-        return "{0:0{1}d}".format(value or 0, self.digits)
+        return f"{value or 0:0{self.digits}d}"
 
 
 class PaddedInt(BasePaddedInt[int]):
@@ -249,7 +249,7 @@ def __init__(self, digits: int = 1):
         self.digits = digits
 
     def format(self, value: float | N) -> str:
-        return "{0:.{1}f}".format(value or 0, self.digits)
+        return f"{value or 0:.{self.digits}f}"
 
 
 class Float(BaseFloat[float]):

beets/ui/commands.py

@@ -488,7 +488,6 @@ def make_track_numbers(self, item, track_info):
         """Format colored track indices."""
         cur_track = self.format_index(item)
         new_track = self.format_index(track_info)
-        templ = "(#{})"
         changed = False
         # Choose color based on change.
         if cur_track != new_track:
@@ -500,10 +499,8 @@ def make_track_numbers(self, item, track_info):
         else:
             highlight_color = "text_faint"
 
-        cur_track = templ.format(cur_track)
-        new_track = templ.format(new_track)
-        lhs_track = ui.colorize(highlight_color, cur_track)
-        rhs_track = ui.colorize(highlight_color, new_track)
+        lhs_track = ui.colorize(highlight_color, f"(#{cur_track})")
+        rhs_track = ui.colorize(highlight_color, f"(#{new_track})")
         return lhs_track, rhs_track, changed
 
     @staticmethod

beetsplug/duplicates.py

@@ -150,7 +150,7 @@ def _dup(lib, opts, args):
             count = self.config["count"].get(bool)
             delete = self.config["delete"].get(bool)
             remove = self.config["remove"].get(bool)
-            fmt = self.config["format"].get(str)
+            fmt_tmpl = self.config["format"].get(str)
             full = self.config["full"].get(bool)
             keys = self.config["keys"].as_str_seq()
             merge = self.config["merge"].get(bool)
@@ -175,15 +175,14 @@ def _dup(lib, opts, args):
                 return
 
             if path:
-                fmt = "$path"
+                fmt_tmpl = "$path"
 
             # Default format string for count mode.
-            if count and not fmt:
+            if count and not fmt_tmpl:
                 if album:
-                    fmt = "$albumartist - $album"
+                    fmt_tmpl = "$albumartist - $album"
                 else:
-                    fmt = "$albumartist - $album - $title"
-                fmt += ": {0}"
+                    fmt_tmpl = "$albumartist - $album - $title"
 
             if checksum:
                 for i in items:
@@ -207,7 +206,7 @@ def _dup(lib, opts, args):
                             delete=delete,
                             remove=remove,
                             tag=tag,
-                            fmt=fmt.format(obj_count),
+                            fmt=f"{fmt_tmpl}: {obj_count}",
                         )
 
         self._command.func = _dup

beetsplug/info.py

@@ -117,7 +117,6 @@ def print_data(data, item=None, fmt=None):
         return
 
     maxwidth = max(len(key) for key in formatted)
-    lineformat = f"{{0:>{maxwidth}}}: {{1}}"
 
     if path:
         ui.print_(displayable_path(path))
@@ -126,7 +125,7 @@ def print_data(data, item=None, fmt=None):
         value = formatted[field]
         if isinstance(value, list):
             value = "; ".join(value)
-        ui.print_(lineformat.format(field, value))
+        ui.print_(f"{field:>{maxwidth}}: {value}")
 
 
 def print_data_keys(data, item=None):
@@ -139,12 +138,11 @@ def print_data_keys(data, item=None):
     if len(formatted) == 0:
         return
 
-    line_format = "{0}{{0}}".format(" " * 4)
     if path:
         ui.print_(displayable_path(path))
 
     for field in sorted(formatted):
-        ui.print_(line_format.format(field))
+        ui.print_(f"    {field}")
 
 
 class InfoPlugin(BeetsPlugin):

beetsplug/inline.py

@@ -36,7 +36,8 @@ def _compile_func(body):
     """Given Python code for a function body, return a compiled
     callable that invokes that code.
     """
-    body = "def {}():\n    {}".format(FUNC_NAME, body.replace("\n", "\n    "))
+    body = body.replace("\n", "\n    ")
+    body = f"def {FUNC_NAME}():\n    {body}"
     code = compile(body, "inline", "exec")
     env = {}
     eval(code, env)

beetsplug/thumbnails.py

@@ -202,7 +202,7 @@ def make_dolphin_cover_thumbnail(self, album):
         artfile = os.path.split(album.artpath)[1]
         with open(syspath(outfilename), "w") as f:
             f.write("[Desktop Entry]\n")
-            f.write("Icon=./{}".format(artfile.decode("utf-8")))
+            f.write(f"Icon=./{artfile.decode('utf-8')}")
             f.close()
         self._log.debug("Wrote file {0}", displayable_path(outfilename))
 

test/plugins/test_random.py

@@ -69,7 +69,7 @@ def experiment(field, histogram=False):
             # Print a histogram (useful for debugging).
             if histogram:
                 for i in range(len(self.items)):
-                    print("{:2d} {}".format(i, "*" * positions.count(i)))
+                    print(f"{i:2d} {'*' * positions.count(i)}")
             return self._stats(positions)
 
         mean1, stdev1, median1 = experiment("artist")

test/test_ui.py

@@ -1261,7 +1261,6 @@ def test_album_data_change_wrap_newline(self):
             msg = self._show_change(
                 cur_artist=long_name, cur_album="another album"
             )
-            # _common.log.info("Message:{}".format(msg))
             assert "artist: another artist" in msg
             assert "  -> the artist" in msg
             assert "another album -> the album" not in msg