Replace percent formatting

Author: snejus

beets/autotag/distance.py

@@ -78,9 +78,9 @@ def string_dist(str1: str | None, str2: str | None) -> float:
     # example, "the something" should be considered equal to
     # "something, the".
     for word in SD_END_WORDS:
-        if str1.endswith(", %s" % word):
+        if str1.endswith(f", {word}"):
             str1 = f"{word} {str1[: -len(word) - 2]}"
-        if str2.endswith(", %s" % word):
+        if str2.endswith(f", {word}"):
             str2 = f"{word} {str2[: -len(word) - 2]}"
 
     # Perform a couple of basic normalizing substitutions.
@@ -444,7 +444,7 @@ def distance(
         # Preferred media options.
         media_patterns: Sequence[str] = preferred_config["media"].as_str_seq()
         options = [
-            re.compile(r"(\d+x)?(%s)" % pat, re.I) for pat in media_patterns
+            re.compile(rf"(\d+x)?({pat})", re.I) for pat in media_patterns
         ]
         if options:
             dist.add_priority("media", album_info.media, options)

beets/dbcore/db.py

@@ -1159,7 +1159,7 @@ def _make_table(self, table: str, fields: Mapping[str, types.Type]):
         """
         # Get current schema.
         with self.transaction() as tx:
-            rows = tx.query("PRAGMA table_info(%s)" % table)
+            rows = tx.query(f"PRAGMA table_info({table})")
         current_fields = {row[1] for row in rows}
 
         field_names = set(fields.keys())

beets/library/models.py

@@ -482,7 +482,7 @@ def item_dir(self):
         """
         item = self.items().get()
         if not item:
-            raise ValueError("empty album for album id %d" % self.id)
+            raise ValueError(f"empty album for album id {self.id}")
         return os.path.dirname(item.path)
 
     def _albumtotal(self):

beets/test/helper.py

@@ -829,8 +829,8 @@ def item_candidates(self, item, artist, title):
 
     def _make_track_match(self, artist, album, number):
         return TrackInfo(
-            title="Applied Track %d" % number,
-            track_id="match %d" % number,
+            title=f"Applied Track {number}",
+            track_id=f"match {number}",
             artist=artist,
             length=1,
             index=0,

beets/ui/__init__.py

@@ -256,7 +256,7 @@ def input_options(
             )
         ):
             # The first option is the default; mark it.
-            show_letter = "[%s]" % found_letter.upper()
+            show_letter = f"[{found_letter.upper()}]"
             is_default = True
         else:
             show_letter = found_letter.upper()
@@ -295,9 +295,9 @@ def input_options(
             if isinstance(default, int):
                 default_name = str(default)
                 default_name = colorize("action_default", default_name)
-                tmpl = "# selection (default %s)"
-                prompt_parts.append(tmpl % default_name)
-                prompt_part_lengths.append(len(tmpl % str(default)))
+                tmpl = "# selection (default {})"
+                prompt_parts.append(tmpl.format(default_name))
+                prompt_part_lengths.append(len(tmpl) - 2 + len(str(default)))
             else:
                 prompt_parts.append("# selection")
                 prompt_part_lengths.append(len(prompt_parts[-1]))
@@ -336,7 +336,7 @@ def input_options(
     if not fallback_prompt:
         fallback_prompt = "Enter one of "
         if numrange:
-            fallback_prompt += "%i-%i, " % numrange
+            fallback_prompt += "{}-{}, ".format(*numrange)
         fallback_prompt += ", ".join(display_letters) + ":"
 
     resp = input_(prompt)
@@ -393,7 +393,7 @@ def input_select_objects(prompt, objs, rep, prompt_all=None):
     objects individually.
     """
     choice = input_options(
-        ("y", "n", "s"), False, "%s? (Yes/no/select)" % (prompt_all or prompt)
+        ("y", "n", "s"), False, f"{prompt_all or prompt}? (Yes/no/select)"
     )
     print()  # Blank line.
 
@@ -407,7 +407,7 @@ def input_select_objects(prompt, objs, rep, prompt_all=None):
             answer = input_options(
                 ("y", "n", "q"),
                 True,
-                "%s? (yes/no/quit)" % prompt,
+                f"{prompt}? (yes/no/quit)",
                 "Enter Y or N:",
             )
             if answer == "y":
@@ -521,7 +521,7 @@ def _colorize(color, text):
     # over all "ANSI codes" in `color`.
     escape = ""
     for code in color:
-        escape = escape + COLOR_ESCAPE + "%im" % ANSI_CODES[code]
+        escape = escape + COLOR_ESCAPE + f"{ANSI_CODES[code]}m"
     return escape + text + RESET_COLOR
 
 
@@ -1462,7 +1462,7 @@ def format_help(self, formatter=None):
         for subcommand in subcommands:
             name = subcommand.name
             if subcommand.aliases:
-                name += " (%s)" % ", ".join(subcommand.aliases)
+                name += f" ({', '.join(subcommand.aliases)})"
             disp_names.append(name)
 
             # Set the help position based on the max width.
@@ -1475,26 +1475,18 @@ def format_help(self, formatter=None):
             # Lifted directly from optparse.py.
             name_width = help_position - formatter.current_indent - 2
             if len(name) > name_width:
-                name = "%*s%s\n" % (formatter.current_indent, "", name)
+                name = f"{' ' * formatter.current_indent}{name}\n"
                 indent_first = help_position
             else:
-                name = "%*s%-*s  " % (
-                    formatter.current_indent,
-                    "",
-                    name_width,
-                    name,
-                )
+                name = f"{' ' * formatter.current_indent}{name:<{name_width}}\n"
                 indent_first = 0
             result.append(name)
             help_width = formatter.width - help_position
             help_lines = textwrap.wrap(subcommand.help, help_width)
             help_line = help_lines[0] if help_lines else ""
-            result.append("%*s%s\n" % (indent_first, "", help_line))
+            result.append(f"{' ' * indent_first}{help_line}\n")
             result.extend(
-                [
-                    "%*s%s\n" % (help_position, "", line)
-                    for line in help_lines[1:]
-                ]
+                [f"{' ' * help_position}{line}\n" for line in help_lines[1:]]
             )
         formatter.dedent()
 

beets/ui/commands.py

@@ -146,13 +146,13 @@ def _print_rows(names):
 
     with lib.transaction() as tx:
         # The SQL uses the DISTINCT to get unique values from the query
-        unique_fields = "SELECT DISTINCT key FROM (%s)"
+        unique_fields = "SELECT DISTINCT key FROM ({})"
 
         print_("Item flexible attributes:")
-        _print_keys(tx.query(unique_fields % library.Item._flex_table))
+        _print_keys(tx.query(unique_fields.format(library.Item._flex_table)))
 
         print_("Album flexible attributes:")
-        _print_keys(tx.query(unique_fields % library.Album._flex_table))
+        _print_keys(tx.query(unique_fields.format(library.Album._flex_table)))
 
 
 fields_cmd = ui.Subcommand(
@@ -1928,7 +1928,7 @@ def stats_func(lib, opts, args):
 
 
 def show_version(lib, opts, args):
-    print_("beets version %s" % beets.__version__)
+    print_(f"beets version {beets.__version__}")
     print_(f"Python version {python_version()}")
     # Show plugins.
     names = sorted(p.name for p in plugins.find_plugins())
@@ -1992,7 +1992,7 @@ def modify_items(lib, mods, dels, query, write, move, album, confirm, inherit):
             extra = ""
 
         changed = ui.input_select_objects(
-            "Really modify%s" % extra,
+            f"Really modify{extra}",
             changed,
             lambda o: print_and_modify(o, mods, dels),
         )
@@ -2170,7 +2170,7 @@ def isalbummoved(album):
     else:
         if confirm:
             objs = ui.input_select_objects(
-                "Really %s" % act,
+                f"Really {act}",
                 objs,
                 lambda o: show_path_changes(
                     [(o.path, o.destination(basedir=dest))]
@@ -2463,22 +2463,18 @@ def completion_script(commands):
     yield "_beet() {\n"
 
     # Command names
-    yield "  local commands='%s'\n" % " ".join(command_names)
+    yield f"  local commands={' '.join(command_names)!r}\n"
     yield "\n"
 
     # Command aliases
-    yield "  local aliases='%s'\n" % " ".join(aliases.keys())
+    yield f"  local aliases={' '.join(aliases.keys())!r}\n"
     for alias, cmd in aliases.items():
         yield f"  local alias__{alias.replace('-', '_')}={cmd}\n"
     yield "\n"
 
     # Fields
-    yield "  fields='%s'\n" % " ".join(
-        set(
-            list(library.Item._fields.keys())
-            + list(library.Album._fields.keys())
-        )
-    )
+    fields = library.Item._fields.keys() | library.Album._fields.keys()
+    yield f"  fields={' '.join(fields)!r}\n"
 
     # Command options
     for cmd, opts in options.items():

beets/util/bluelet.py

@@ -559,7 +559,7 @@ def spawn(coro):
     and child coroutines run concurrently.
     """
     if not isinstance(coro, types.GeneratorType):
-        raise ValueError("%s is not a coroutine" % coro)
+        raise ValueError(f"{coro} is not a coroutine")
     return SpawnEvent(coro)
 
 
@@ -569,7 +569,7 @@ def call(coro):
     returns a value using end(), then this event returns that value.
     """
     if not isinstance(coro, types.GeneratorType):
-        raise ValueError("%s is not a coroutine" % coro)
+        raise ValueError(f"{coro} is not a coroutine")
     return DelegationEvent(coro)
 
 

beets/util/functemplate.py

@@ -136,7 +136,7 @@ def __init__(self, ident, original):
         self.original = original
 
     def __repr__(self):
-        return "Symbol(%s)" % repr(self.ident)
+        return f"Symbol({self.ident!r})"
 
     def evaluate(self, env):
         """Evaluate the symbol in the environment, returning a Unicode
@@ -178,7 +178,7 @@ def evaluate(self, env):
             except Exception as exc:
                 # Function raised exception! Maybe inlining the name of
                 # the exception will help debug.
-                return "<%s>" % str(exc)
+                return f"<{exc}>"
             return str(out)
         else:
             return self.original
@@ -224,7 +224,7 @@ def __init__(self, parts):
         self.parts = parts
 
     def __repr__(self):
-        return "Expression(%s)" % (repr(self.parts))
+        return f"Expression({self.parts!r})"
 
     def evaluate(self, env):
         """Evaluate the entire expression in the environment, returning
@@ -296,9 +296,6 @@ def __init__(self, string, in_argument=False):
         GROUP_CLOSE,
         ESCAPE_CHAR,
     )
-    special_char_re = re.compile(
-        r"[%s]|\Z" % "".join(re.escape(c) for c in special_chars)
-    )
     escapable_chars = (SYMBOL_DELIM, FUNC_DELIM, GROUP_CLOSE, ARG_SEP)
     terminator_chars = (GROUP_CLOSE,)
 
@@ -310,24 +307,18 @@ def parse_expression(self):
         """
         # Append comma (ARG_SEP) to the list of special characters only when
         # parsing function arguments.
-        extra_special_chars = ()
-        special_char_re = self.special_char_re
-        if self.in_argument:
-            extra_special_chars = (ARG_SEP,)
-            special_char_re = re.compile(
-                r"[%s]|\Z"
-                % "".join(
-                    re.escape(c)
-                    for c in self.special_chars + extra_special_chars
-                )
-            )
+        extra_special_chars = (ARG_SEP,) if self.in_argument else ()
+        special_chars = (*self.special_chars, *extra_special_chars)
+        special_char_re = re.compile(
+            rf"[{''.join(map(re.escape, special_chars))}]|\Z"
+        )
 
         text_parts = []
 
         while self.pos < len(self.string):
             char = self.string[self.pos]
 
-            if char not in self.special_chars + extra_special_chars:
+            if char not in special_chars:
                 # A non-special character. Skip to the next special
                 # character, treating the interstice as literal text.
                 next_pos = (

beets/util/units.py

@@ -19,7 +19,7 @@ def human_seconds_short(interval):
     string.
     """
     interval = int(interval)
-    return "%i:%02i" % (interval // 60, interval % 60)
+    return f"{interval // 60}:{interval % 60:02d}"
 
 
 def human_bytes(size):

beetsplug/bpd/__init__.py

@@ -52,7 +52,7 @@
 PROTOCOL_VERSION = "0.16.0"
 BUFSIZE = 1024
 
-HELLO = "OK MPD %s" % PROTOCOL_VERSION
+HELLO = f"OK MPD {PROTOCOL_VERSION}"
 CLIST_BEGIN = "command_list_begin"
 CLIST_VERBOSE_BEGIN = "command_list_ok_begin"
 CLIST_END = "command_list_end"
@@ -1219,7 +1219,7 @@ def cmd_lsinfo(self, conn, path="/"):
                 if dirpath.startswith("/"):
                     # Strip leading slash (libmpc rejects this).
                     dirpath = dirpath[1:]
-                yield "directory: %s" % dirpath
+                yield f"directory: {dirpath}"
 
     def _listall(self, basepath, node, info=False):
         """Helper function for recursive listing. If info, show