*/*: run flynt

Signed-off-by: Sam James <sam@gentoo.org>

Author: thesamesam

pym/gentoolkit/atom.py

@@ -204,8 +204,8 @@ def __ge__(self, other):
 
     def __repr__(self):
         uc = self.use_conditional
-        uc = "%s? " % uc if uc is not None else ""
-        return "<{} {!r}>".format(self.__class__.__name__, f"{uc}{self.atom}")
+        uc = f"{uc}? " if uc is not None else ""
+        return f"<{self.__class__.__name__} {uc}{self.atom}>"
 
     def __setattr__(self, name, value):
         object.__setattr__(self, name, value)
@@ -359,7 +359,7 @@ def intersects(self, other):
     def get_depstr(self):
         """Returns a string representation of the original dep"""
         uc = self.use_conditional
-        uc = "%s? " % uc if uc is not None else ""
+        uc = f"{uc}? " if uc is not None else ""
         return f"{uc}{self.atom}"
 
 

pym/gentoolkit/base.py

@@ -147,5 +147,5 @@ def mod_usage(mod_name="module", arg="pkgspec", optional=False):
         usage=pp.emph("Usage"),
         mod_name=pp.command(mod_name),
         opts=pp.localoption("options"),
-        arg=("[%s]" % pp.emph(arg)) if optional else pp.emph(arg),
+        arg=f"[{pp.emph(arg)}]" if optional else pp.emph(arg),
     )

pym/gentoolkit/eclean/clean.py

@@ -121,7 +121,7 @@ def _get_size(self, key):
                     key_size += statinfo.st_size
             except OSError as er:
                 print(pp.error("Could not get stat info for:" + file_), file=sys.stderr)
-                print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                print(pp.error(f"Error: {er!s}"), file=sys.stderr)
         return key_size
 
     def _get_size_valid_symlink(self, file_):
@@ -140,7 +140,7 @@ def _get_size_valid_symlink(self, file_):
         except OSError as er:
             if os.path.exists(os.readlink(file_)):
                 print(pp.error("Could not get stat info for:" + file_), file=sys.stderr)
-                print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                print(pp.error(f"Error: {er!s}"), file=sys.stderr)
             else:
                 try:
                     os.remove(file_)
@@ -153,7 +153,7 @@ def _get_size_valid_symlink(self, file_):
                         pp.error("Error deleting broken symbolic link " + file_),
                         file=sys.stderr,
                     )
-                    print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                    print(pp.error(f"Error: {er!s}"), file=sys.stderr)
         return 0
 
     def _clean_binary_package(self, files: tuple[str, str | None], key: str):
@@ -186,7 +186,7 @@ def _clean_binary_package(self, files: tuple[str, str | None], key: str):
                             pass
                 except OSError as er:
                     print(pp.error("Could not delete " + file_), file=sys.stderr)
-                    print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                    print(pp.error(f"Error: {er!s}"), file=sys.stderr)
         return clean_size
 
     def _clean_files(self, files, key):
@@ -211,14 +211,14 @@ def _clean_files(self, files, key):
                             pp.error("Error deleting broken symbolic link " + file_),
                             file=sys.stderr,
                         )
-                        print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                        print(pp.error(f"Error: {er!s}"), file=sys.stderr)
                         break
                 else:
                     print(
                         pp.error("Could not get stat info for:" + file_),
                         file=sys.stderr,
                     )
-                    print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                    print(pp.error(f"Error: {er!s}"), file=sys.stderr)
             if self.controller(statinfo.st_size, key, file_, "file"):
                 # ... try to delete it.
                 try:
@@ -232,7 +232,7 @@ def _clean_files(self, files, key):
                             pass
                 except OSError as er:
                     print(pp.error("Could not delete " + file_), file=sys.stderr)
-                    print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                    print(pp.error(f"Error: {er!s}"), file=sys.stderr)
         return clean_size
 
     def _clean_vcs_src(self, deprecated_vcs, pretend=False):
@@ -249,7 +249,7 @@ def _clean_vcs_src(self, deprecated_vcs, pretend=False):
                             pp.error("Could not get stat info for:" + fp),
                             file=sys.stderr,
                         )
-                        print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                        print(pp.error(f"Error: {er!s}"), file=sys.stderr)
                     clean_size += statinfo.st_size
                     csize += statinfo.st_size
 
@@ -259,5 +259,5 @@ def _clean_vcs_src(self, deprecated_vcs, pretend=False):
                     shutil.rmtree(checkout)
             except OSError as er:
                 print(pp.error("Could not delete " + checkout), file=sys.stderr)
-                print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+                print(pp.error(f"Error: {er!s}"), file=sys.stderr)
         return clean_size

pym/gentoolkit/eclean/cli.py

@@ -332,7 +332,7 @@ def printUsage(_error=None, help=None, unresolved_invalids=None):
         print(file=out)
     print(
         "More detailed instruction can be found in",
-        turquoise("`man %s`" % __productname__),
+        turquoise(f"`man {__productname__}`"),
         file=out,
     )
 
@@ -457,7 +457,7 @@ def optionSwitch(option, opts, action=None):
             if (not options["destructive"]) and options[opt]:
                 if not options["quiet"]:
                     print(
-                        pp.error("--%s only makes sense in --deep mode." % opt),
+                        pp.error(f"--{opt} only makes sense in --deep mode."),
                         file=sys.stderr,
                     )
                 options[opt] = False
@@ -748,11 +748,11 @@ def main():
         except ParseExcludeFileException as e:
             print(pp.error(str(e)), file=sys.stderr)
             print(
-                pp.error("Invalid exclusion file: %s" % options["exclude-file"]),
+                pp.error(f"Invalid exclusion file: {options['exclude-file']}"),
                 file=sys.stderr,
             )
             print(
-                pp.error("See format of this file in `man %s`" % __productname__),
+                pp.error(f"See format of this file in `man {__productname__}`"),
                 file=sys.stderr,
             )
             sys.exit(1)

pym/gentoolkit/eclean/exclude.py

@@ -225,7 +225,7 @@ def exclDictMatchCP(exclude, pkg):
         dprint(
             "exclude",
             "exclDictMatchCP: Invalid package name: "
-            + "%s, Could not determine category" % pkg,
+            + f"{pkg}, Could not determine category",
         )
         cat = ""
     if "categories" in exclude and cat in exclude["categories"]:
@@ -279,7 +279,7 @@ def exclMatchFilename(exclude_names, filename):
         dprint(
             "exclude",
             "exclMatchFilename: filename: "
-            + "%s, Could not determine package name" % filename,
+            + f"{filename}, Could not determine package name",
         )
         return False
     pkgname = found.group("pkgname")

pym/gentoolkit/eclean/output.py

@@ -98,7 +98,7 @@ def prettySize(self, size, justify=False, color=None):
         while len(units) and size >= 1000:
             size = size / 1024.0
             units.pop()
-        sizestr = "%.1f" % (round(size, 1)) + units[-1]
+        sizestr = f"{round(size, 1):.1f}" + units[-1]
         if justify:
             sizestr = (
                 " " + self.brace("[ ") + color(sizestr.rjust(8)) + self.brace(" ]")

pym/gentoolkit/eclean/search.py

@@ -55,7 +55,7 @@ def get_distdir():
 
     d = portage.settings["DISTDIR"]
     if not os.path.isdir(d):
-        e = pp.error("%s does not appear to be a directory.\n" % d)
+        e = pp.error(f"{d} does not appear to be a directory.\n")
         e += pp.error("Please set DISTDIR to a sane value.\n")
         e += pp.error("(Check your make.conf file and environment).")
         print(e, file=sys.stderr)
@@ -138,7 +138,7 @@ def findDistfiles(
             installed_included = True
         if destructive:
             self.output(
-                "...destructive type search: %d packages already found" % len(pkgs)
+                f"...destructive type search: {len(pkgs)} packages already found"
             )
             pkgs, _deprecated = self._destructive(
                 package_names, exclude, pkgs, installed_included
@@ -147,21 +147,21 @@ def findDistfiles(
                 # use the same structure as invalid binpkgs for list_pkgs()
                 deprecated.update({_distdir: _deprecated})
         # gather the files to be cleaned
-        self.output("...checking limits for %d ebuild sources" % len(pkgs))
+        self.output(f"...checking limits for {len(pkgs)} ebuild sources")
 
         vcs = self.vcs_check(Path(_distdir))
         checks = self._get_default_checks(size_limit, time_limit, exclude, destructive)
         checks.extend(extra_checks)
         clean_me = self._check_limits(_distdir, checks, clean_me)
         # remove any protected files from the list
         self.output(
-            "...removing protected sources from %s candidates to clean" % len(clean_me)
+            f"...removing protected sources from {len(clean_me)} candidates to clean"
         )
         clean_me = self._remove_protected(pkgs, clean_me)
         if not deprecate and len(exclude) and len(clean_me):
             self.output(
                 "...checking final for exclusion from "
-                + "%s remaining candidates to clean" % len(clean_me)
+                + f"{len(clean_me)} remaining candidates to clean"
             )
             clean_me, saved = self._check_excludes(exclude, clean_me)
         return clean_me, saved, deprecated, vcs
@@ -326,24 +326,22 @@ def _non_destructive(
         if fetch_restricted and destructive:
             self.output(
                 "   - getting source file names "
-                + "for %d installed ebuilds" % len(installed_cpvs)
+                + f"for {len(installed_cpvs)} installed ebuilds"
             )
             pkgs, _deprecated = self._unrestricted(pkgs, installed_cpvs)
             deprecated.update(_deprecated)
             # remove the installed cpvs then check the remaining for fetch restiction
             cpvs.difference_update(installed_cpvs)
             self.output(
                 "   - getting fetch-restricted source file names "
-                + "for %d remaining ebuilds" % len(cpvs)
+                + f"for {len(cpvs)} remaining ebuilds"
             )
             pkgs, _deprecated = self._fetch_restricted(pkgs, cpvs)
             deprecated.update(_deprecated)
             # save the installed cpv list to re-use in _destructive()
             self.installed_cpvs = installed_cpvs.copy()
         else:
-            self.output(
-                "   - getting source file names " + "for %d ebuilds" % len(cpvs)
-            )
+            self.output("   - getting source file names " + f"for {len(cpvs)} ebuilds")
             pkgs, _deprecated = self._unrestricted(pkgs, cpvs)
             deprecated.update(_deprecated)
         return pkgs, deprecated
@@ -466,12 +464,12 @@ def _destructive(
                     pkgset.update(self.vardb.cpv_all())
                 else:
                     pkgset.update(self.installed_cpvs)
-                self.output("   - processing %s installed ebuilds" % len(pkgset))
+                self.output(f"   - processing {len(pkgset)} installed ebuilds")
             elif package_names:
                 # list all CPV's from portree for CP's in vartree
                 # print( "_destructive: getting vardb.cp_all")
                 cps = self.vardb.cp_all()
-                self.output("   - processing %s installed packages" % len(cps))
+                self.output(f"   - processing {len(cps)} installed packages")
                 for package in cps:
                     pkgset.update(self.portdb.cp_list(package))
         self.output("   - processing excluded")
@@ -571,11 +569,11 @@ def _deps_equal(deps_a, eapi_a, deps_b, eapi_b, libc_deps, uselist=None, cpv=Non
         deps_b = use_reduce(deps_b, uselist=uselist, eapi=eapi_b, token_class=Atom)
     except InvalidDependString as er:  # the ebuild depend string is bad
         print(
-            pp.warn("Warning: Invalid ebuild DEPEND String found for: %s" % cpv),
+            pp.warn(f"Warning: Invalid ebuild DEPEND String found for: {cpv}"),
             file=sys.stderr,
         )
         print(
-            pp.warn("Warning: DEPEND string for ebuild: %s" % deps_b),
+            pp.warn(f"Warning: DEPEND string for ebuild: {deps_b}"),
             file=sys.stderr,
         )
         print(er, file=sys.stderr)
@@ -737,7 +735,7 @@ def findPackages(
             exit(0)
         print(pp.error("Error accessing PKGDIR."), file=sys.stderr)
         print(pp.error("(Check your make.conf file and environment)."), file=sys.stderr)
-        print(pp.error("Error: %s" % str(er)), file=sys.stderr)
+        print(pp.error(f"Error: {er!s}"), file=sys.stderr)
         exit(1)
 
     libc_deps = find_libc_deps(var_dbapi, False)

pym/gentoolkit/ekeyword/ekeyword.py

@@ -65,7 +65,7 @@
 
 def warning(msg):
     """Write |msg| as a warning to stderr"""
-    print("warning: %s" % msg, file=sys.stderr)
+    print(f"warning: {msg}", file=sys.stderr)
 
 
 def keyword_to_arch(keyword):
@@ -227,7 +227,7 @@ def process_keywords(keywords, ops, arch_status=None):
                 # Already deleted.  Whee.
                 pass
             else:
-                raise ValueError("unknown operation %s" % op)
+                raise ValueError(f"unknown operation {op}")
 
     return new_keywords
 
@@ -295,7 +295,7 @@ def logit(msg):
                 old_keywords = sort_keywords(old_keywords)
 
             new_keywords = sort_keywords(new_keywords)
-            line = '{}"{}"{}\n'.format(m.group(1), " ".join(new_keywords), m.group(5))
+            line = f"{m.group(1)}\"{' '.join(new_keywords)}\"{m.group(5)}\n"
             if style in ("color-inline", "inline"):
                 logit(diff_keywords(old_keywords, new_keywords, style=style))
             else:
@@ -320,9 +320,9 @@ def logit(msg):
                     deleted_keywords = [
                         x for x in old_keywords if x not in new_keywords
                     ]
-                    logit("--- %s" % " ".join(deleted_keywords))
+                    logit(f"--- {' '.join(deleted_keywords)}")
                     added_keywords = [x for x in new_keywords if x not in old_keywords]
-                    logit("+++ %s" % " ".join(added_keywords))
+                    logit(f"+++ {' '.join(added_keywords)}")
 
         content.append(line)
 
@@ -404,7 +404,7 @@ def ignorable_arg(arg, quiet=0):
     """Whether it's ok to ignore this argument"""
     if os.path.isdir(arg):
         if not quiet:
-            warning("ignoring directory %s" % arg)
+            warning(f"ignoring directory {arg}")
         return True
 
     WHITELIST = (
@@ -414,7 +414,7 @@ def ignorable_arg(arg, quiet=0):
     base = os.path.basename(arg)
     if base in WHITELIST or base.startswith(".") or base.endswith("~"):
         if not quiet:
-            warning("ignoring file: %s" % arg)
+            warning(f"ignoring file: {arg}")
         return True
 
     return False
@@ -440,7 +440,7 @@ def args_to_work(args, arch_status=None, _repo=None, quiet=0):
             if not arch_status or op.arch in arch_status:
                 todo_arches.append(op)
             else:
-                raise ValueError("unknown arch/argument: %s" % arg)
+                raise ValueError(f"unknown arch/argument: {arg}")
 
     if todo_arches:
         raise ValueError("missing ebuilds to process!")

pym/gentoolkit/ekeyword/test_ekeyword.py

@@ -218,7 +218,7 @@ def _testKeywords(self, line):
             ekeyword.Op(None, "arm", None),
             ekeyword.Op("~", "sparc", None),
         )
-        return ekeyword.process_content("file", ["%s\n" % line], ops, quiet=True)
+        return ekeyword.process_content("file", [f"{line}\n"], ops, quiet=True)
 
     def testKeywords(self):
         """Basic KEYWORDS mod"""

pym/gentoolkit/enalyze/__init__.py

@@ -77,7 +77,7 @@ def main():
         global_opts, args = getopt(sys.argv[1:], short_opts, long_opts)
     except GetoptError as err:
         sys.stderr.write(" \n")
-        sys.stderr.write(pp.error("Global %s\n" % err))
+        sys.stderr.write(pp.error(f"Global {err}\n"))
         print_help(MODULE_INFO, FORMATTED_OPTIONS, with_description=False)
         sys.exit(2)
 
@@ -99,7 +99,7 @@ def main():
     try:
         expanded_module_name = expand_module_name(module_name)
     except KeyError:
-        sys.stderr.write(pp.error("Unknown module '%s'" % module_name))
+        sys.stderr.write(pp.error(f"Unknown module '{module_name}'"))
         print_help(MODULE_INFO, FORMATTED_OPTIONS, with_description=False)
         sys.exit(2)