[gentoo-commits] proj/portage:master commit in: lib/portage/, lib/portage/tests/resolver/, lib/_emerge/

[Sam James]

commit:     5fb942f34a8b1538547d704a0e163845261fb1eb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 13:28:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 15:12:38 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5fb942f3

*/*: run pyupgrade --py37-plus again

After running flynt, it finds a few more bits.

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

 lib/_emerge/actions.py                           | 2 +-
 lib/_emerge/depgraph.py                          | 2 +-
 lib/portage/tests/resolver/ResolverPlayground.py | 2 +-
 lib/portage/update.py                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index b536e4a26..ba6d99d25 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -1644,7 +1644,7 @@ def _calc_depclean(settings, trees, ldpath_mtimes, 
myopts, action, args_set, spi
                 if debug:
                     writemsg_level(
                         "Candidates: [{}]\n".format(
-                            ", ".join("'{}'".format(x) for x in atoms)
+                            ", ".join(f"'{x}'" for x in atoms)
                         ),
                         noiselevel=-1,
                         level=logging.DEBUG,

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 0f5e02941..76d0950ae 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -2038,7 +2038,7 @@ class depgraph:
                 f"      slot: {slot_atom}",
                 "   parents: {}".format(
                     ", ".join(
-                        "({}, '{}')".format(ppkg, atom) for ppkg, atom in 
all_parents
+                        f"({ppkg}, '{atom}')" for ppkg, atom in all_parents
                     )
                 ),
                 "",

diff --git a/lib/portage/tests/resolver/ResolverPlayground.py 
b/lib/portage/tests/resolver/ResolverPlayground.py
index 6d60a671e..d96be8247 100644
--- a/lib/portage/tests/resolver/ResolverPlayground.py
+++ b/lib/portage/tests/resolver/ResolverPlayground.py
@@ -689,7 +689,7 @@ class ResolverPlayground:
                 "[%s]\n%s"
                 % (
                     repo_name,
-                    "\n".join("{} = {}".format(k, v) for k, v in 
repo_config.items()),
+                    "\n".join(f"{k} = {v}" for k, v in repo_config.items()),
                 )
                 for repo_name, repo_config in self._repositories.items()
             ),

diff --git a/lib/portage/update.py b/lib/portage/update.py
index 773166688..0810361f8 100644
--- a/lib/portage/update.py
+++ b/lib/portage/update.py
@@ -425,7 +425,7 @@ def update_config_files(
                             # add a comment with the update command, so
                             # the user can clearly see what happened
                             contents[pos] = "# {}\n".format(
-                                " ".join("{}".format(x) for x in update_cmd)
+                                " ".join(f"{x}" for x in update_cmd)
                             )
                             contents.insert(
                                 pos + 1,