Run `flynt`

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

10 files changed, 29 insertions, 41 deletions

diff --git a/lib/_emerge/UseFlagDisplay.py b/lib/_emerge/UseFlagDisplay.py
index 4c526947d..7027db86a 100644
--- a/lib/_emerge/UseFlagDisplay.py
+++ b/lib/_emerge/UseFlagDisplay.py
@@ -109,6 +109,6 @@ def pkg_use_display(pkg, opts, modified_use=None):
             flags.sort(key=UseFlagDisplay.sort_combined)
         else:
             flags.sort(key=UseFlagDisplay.sort_separated)
-        flag_displays.append(f"{varname}=\"{' '.join('{}'.format(f) for f in flags)}\"")
+        flag_displays.append(f"{varname}=\"{' '.join(f'{f}' for f in flags)}\"")
 
     return " ".join(flag_displays)
diff --git a/lib/portage/_emirrordist/ContentDB.py b/lib/portage/_emirrordist/ContentDB.py
index c9e5f3e7b..622a437aa 100644
--- a/lib/portage/_emirrordist/ContentDB.py
+++ b/lib/portage/_emirrordist/ContentDB.py
@@ -112,10 +112,10 @@ class ContentDB:
                             pass
 
             if remaining:
-                logger.debug(("drop '%s' revision(s) from content db") % filename)
+                logger.debug(f"drop '{filename}' revision(s) from content db")
                 self._shelve[distfile_key] = remaining
             else:
-                logger.debug(("drop '%s' from content db") % filename)
+                logger.debug(f"drop '{filename}' from content db")
                 try:
                     del self._shelve[distfile_key]
                 except KeyError:
diff --git a/lib/portage/_emirrordist/DeletionTask.py b/lib/portage/_emirrordist/DeletionTask.py
index cb8174d10..2dd97237b 100644
--- a/lib/portage/_emirrordist/DeletionTask.py
+++ b/lib/portage/_emirrordist/DeletionTask.py
@@ -20,10 +20,10 @@ class DeletionTask(CompositeTask):
             recycle_path = os.path.join(self.config.options.recycle_dir, self.distfile)
             if self.config.options.dry_run:
                 logger.info(
-                    ("dry-run: move '%s' from " "distfiles to recycle") % self.distfile
+                    f"dry-run: move '{self.distfile}' from distfiles to recycle"
                 )
             else:
-                logger.debug(("move '%s' from " "distfiles to recycle") % self.distfile)
+                logger.debug(f"move '{self.distfile}' from distfiles to recycle")
                 try:
                     # note: distfile_path can be a symlink here
                     os.rename(os.path.realpath(self.distfile_path), recycle_path)
@@ -51,9 +51,9 @@ class DeletionTask(CompositeTask):
         success = True
 
         if self.config.options.dry_run:
-            logger.info(("dry-run: delete '%s' from " "distfiles") % self.distfile)
+            logger.info(f"dry-run: delete '{self.distfile}' from distfiles")
         else:
-            logger.debug(("delete '%s' from " "distfiles") % self.distfile)
+            logger.debug(f"delete '{self.distfile}' from distfiles")
             try:
                 os.unlink(self.distfile_path)
             except OSError as e:
@@ -102,7 +102,7 @@ class DeletionTask(CompositeTask):
         success = True
         for layout in self.config.layouts:
             if isinstance(layout, ContentHashLayout) and not self.distfile.digests:
-                logger.debug(("_delete_links: '%s' has " "no digests") % self.distfile)
+                logger.debug(f"_delete_links: '{self.distfile}' has no digests")
                 continue
             distfile_path = os.path.join(
                 self.config.options.distfiles, layout.get_path(self.distfile)
@@ -134,7 +134,7 @@ class DeletionTask(CompositeTask):
             except KeyError:
                 pass
             else:
-                logger.debug(("drop '%s' from " "distfiles db") % self.distfile)
+                logger.debug(f"drop '{self.distfile}' from distfiles db")
 
         if self.config.content_db is not None:
             self.config.content_db.remove(self.distfile)
@@ -145,4 +145,4 @@ class DeletionTask(CompositeTask):
             except KeyError:
                 pass
             else:
-                logger.debug(("drop '%s' from " "deletion db") % self.distfile)
+                logger.debug(f"drop '{self.distfile}' from deletion db")
diff --git a/lib/portage/_emirrordist/FetchTask.py b/lib/portage/_emirrordist/FetchTask.py
index 5b1d596fe..013163f83 100644
--- a/lib/portage/_emirrordist/FetchTask.py
+++ b/lib/portage/_emirrordist/FetchTask.py
@@ -121,8 +121,7 @@ class FetchTask(CompositeTask):
                             )
                     else:
                         self.config.log_failure(
-                            "%s\t%s\t%s"
-                            % (self.cpv, self.distfile, "unlink failed in distfiles")
+                            f"{self.cpv}\t{self.distfile}\tunlink failed in distfiles"
                         )
                         unlink_success = False
                 if not unlink_success:
diff --git a/lib/portage/_emirrordist/MirrorDistTask.py b/lib/portage/_emirrordist/MirrorDistTask.py
index 2925394a8..984b9fbee 100644
--- a/lib/portage/_emirrordist/MirrorDistTask.py
+++ b/lib/portage/_emirrordist/MirrorDistTask.py
@@ -91,14 +91,12 @@ class MirrorDistTask(CompositeTask):
                 st = os.stat(recycle_file)
             except OSError as e:
                 if e.errno not in (errno.ENOENT, errno.ESTALE):
-                    logger.error(
-                        ("stat failed for '%s' in " "recycle: %s") % (filename, e)
-                    )
+                    logger.error(f"stat failed for '{filename}' in recycle: {e}")
                 continue
 
             value = recycle_db_cache.pop(filename, None)
             if value is None:
-                logger.debug(("add '%s' to " "recycle db") % filename)
+                logger.debug(f"add '{filename}' to recycle db")
                 recycle_db[filename] = (st.st_size, start_time)
             else:
                 r_size, r_time = value
@@ -106,27 +104,24 @@ class MirrorDistTask(CompositeTask):
                     recycle_db[filename] = (st.st_size, start_time)
                 elif r_time + r_deletion_delay < start_time:
                     if self._config.options.dry_run:
-                        logger.info(("dry-run: delete '%s' from " "recycle") % filename)
-                        logger.info(("drop '%s' from " "recycle db") % filename)
+                        logger.info(f"dry-run: delete '{filename}' from recycle")
+                        logger.info(f"drop '{filename}' from recycle db")
                     else:
                         try:
                             os.unlink(recycle_file)
                         except OSError as e:
                             if e.errno not in (errno.ENOENT, errno.ESTALE):
                                 logger.error(
-                                    ("delete '%s' from " "recycle failed: %s")
-                                    % (filename, e)
+                                    f"delete '{filename}' from recycle failed: {e}"
                                 )
                         else:
-                            logger.debug(("delete '%s' from " "recycle") % filename)
+                            logger.debug(f"delete '{filename}' from recycle")
                             try:
                                 del recycle_db[filename]
                             except KeyError:
                                 pass
                             else:
-                                logger.debug(
-                                    ("drop '%s' from " "recycle db") % filename
-                                )
+                                logger.debug(f"drop '{filename}' from recycle db")
 
         # Existing files were popped from recycle_db_cache,
         # so any remaining entries are for files that no
@@ -137,7 +132,7 @@ class MirrorDistTask(CompositeTask):
             except KeyError:
                 pass
             else:
-                logger.debug(("drop non-existent '%s' from " "recycle db") % filename)
+                logger.debug(f"drop non-existent '{filename}' from recycle db")
 
     def _scheduled_deletion_log(self):
         start_time = self._config.start_time
@@ -168,8 +163,7 @@ class MirrorDistTask(CompositeTask):
             date_files = date_map[date]
             if dry_run:
                 logger.info(
-                    ("dry-run: scheduled deletions for %s: %s files")
-                    % (date, len(date_files))
+                    f"dry-run: scheduled deletions for {date}: {len(date_files)} files"
                 )
             lines.append(f"{date}\n")
             for filename in date_files:
diff --git a/lib/portage/_emirrordist/main.py b/lib/portage/_emirrordist/main.py
index 736a60555..dfddc3788 100644
--- a/lib/portage/_emirrordist/main.py
+++ b/lib/portage/_emirrordist/main.py
@@ -334,9 +334,7 @@ def emirrordist_main(args):
             os.path.isdir(options.temp_dir)
             and os.access(options.temp_dir, os.W_OK | os.X_OK)
         ):
-            parser.error(
-                ("--temp-dir '%s' is not a " "writable directory") % options.temp_dir
-            )
+            parser.error(f"--temp-dir '{options.temp_dir}' is not a writable directory")
 
     if options.distfiles is not None:
         options.distfiles = normalize_path(os.path.abspath(options.distfiles))
@@ -346,7 +344,7 @@ def emirrordist_main(args):
             and os.access(options.distfiles, os.W_OK | os.X_OK)
         ):
             parser.error(
-                ("--distfiles '%s' is not a " "writable directory") % options.distfiles
+                f"--distfiles '{options.distfiles}' is not a writable directory"
             )
     else:
         parser.error("missing required --distfiles parameter")
@@ -392,8 +390,7 @@ def emirrordist_main(args):
             and os.access(options.recycle_dir, os.W_OK | os.X_OK)
         ):
             parser.error(
-                ("--recycle-dir '%s' is not a " "writable directory")
-                % options.recycle_dir
+                f"--recycle-dir '{options.recycle_dir}' is not a writable directory"
             )
 
     if options.recycle_db is not None:
@@ -412,8 +409,7 @@ def emirrordist_main(args):
             and os.access(options.fetch_log_dir, os.W_OK | os.X_OK)
         ):
             parser.error(
-                ("--fetch-log-dir '%s' is not a " "writable directory")
-                % options.fetch_log_dir
+                f"--fetch-log-dir '{options.fetch_log_dir}' is not a writable directory"
             )
 
     if options.whitelist_from:
diff --git a/lib/portage/output.py b/lib/portage/output.py
index 880686992..cdeeb18e9 100644
--- a/lib/portage/output.py
+++ b/lib/portage/output.py
@@ -807,8 +807,8 @@ class ProgressBar:
 
     def _set_desc(self):
         self._desc = "{}{}".format(
-            "%s: " % self._title if self._title else "",
-            "%s" % self._label if self._label else "",
+            f"{self._title}: " if self._title else "",
+            f"{self._label}" if self._label else "",
         )
         if len(self._desc) > self._desc_max_length:  # truncate if too long
             self._desc = f"{self._desc[:self._desc_max_length - 3]}..."
diff --git a/lib/portage/package/ebuild/_parallel_manifest/ManifestProcess.py b/lib/portage/package/ebuild/_parallel_manifest/ManifestProcess.py
index 467105e12..f1a30670b 100644
--- a/lib/portage/package/ebuild/_parallel_manifest/ManifestProcess.py
+++ b/lib/portage/package/ebuild/_parallel_manifest/ManifestProcess.py
@@ -30,7 +30,7 @@ class ManifestProcess(ForkProcess):
             return 1
 
         except PortagePackageException as e:
-            portage.writemsg(("!!! %s\n") % (e,), noiselevel=-1)
+            portage.writemsg(f"!!! {e}\n", noiselevel=-1)
             return 1
 
         try:
diff --git a/lib/portage/package/ebuild/digestgen.py b/lib/portage/package/ebuild/digestgen.py
index b7a570da9..36d979fff 100644
--- a/lib/portage/package/ebuild/digestgen.py
+++ b/lib/portage/package/ebuild/digestgen.py
@@ -199,7 +199,7 @@ def digestgen(myarchives=None, mysettings=None, myportdb=None):
             )
             return 0
         except PortagePackageException as e:
-            writemsg(("!!! %s\n") % (e,), noiselevel=-1)
+            writemsg(f"!!! {e}\n", noiselevel=-1)
             return 0
         try:
             mf.write(sign=False)
diff --git a/lib/portage/tests/util/test_uniqueArray.py b/lib/portage/tests/util/test_uniqueArray.py
index c4446c8ea..717a914ca 100644
--- a/lib/portage/tests/util/test_uniqueArray.py
+++ b/lib/portage/tests/util/test_uniqueArray.py
@@ -24,6 +24,5 @@ class UniqueArrayTestCase(TestCase):
                 number = result.count(item)
                 self.assertFalse(
                     number != 1,
-                    msg=("%s contains %s of %s, " "should be only 1")
-                    % (result, number, item),
+                    msg=f"{result} contains {number} of {item}, should be only 1",
                 )