[gentoo-commits] proj/portage:master commit in: lib/portage/

["Sam James" <sam@gentoo.org>]

commit:     579092cb02fc15a7047c3c3c2c28d6aae6ea2aeb
Author:     Kenneth Raplee <kenrap <AT> kennethraplee <DOT> com>
AuthorDate: Sat Apr  2 01:23:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 19:04:39 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=579092cb

Inline key-value insertions as dict expressions with key-value pairs

Signed-off-by: Kenneth Raplee <kenrap <AT> kennethraplee.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/manifest.py |  3 +--
 lib/portage/output.py   | 58 ++++++++++++++++++++++++-------------------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/lib/portage/manifest.py b/lib/portage/manifest.py
index f0fe1fbca..3555e08de 100644
--- a/lib/portage/manifest.py
+++ b/lib/portage/manifest.py
@@ -317,8 +317,7 @@ class Manifest:
         try:
             myentries = list(self._createManifestEntries())
             update_manifest = True
-            preserved_stats = {}
-            preserved_stats[self.pkgdir.rstrip(os.sep)] = os.stat(self.pkgdir)
+            preserved_stats = {self.pkgdir.rstrip(os.sep): os.stat(self.pkgdir)}
             if myentries and not force:
                 try:
                     f = io.open(

diff --git a/lib/portage/output.py b/lib/portage/output.py
index e20046fc5..565f782ff 100644
--- a/lib/portage/output.py
+++ b/lib/portage/output.py
@@ -38,40 +38,38 @@ dotitles = 1
 _styles = {}
 """Maps style class to tuple of attribute names."""
 
-codes = {}
 """Maps attribute name to ansi code."""
 
 esc_seq = "\x1b["
 
-codes["normal"] = esc_seq + "0m"
-codes["reset"] = esc_seq + "39;49;00m"
-
-codes["bold"] = esc_seq + "01m"
-codes["faint"] = esc_seq + "02m"
-codes["standout"] = esc_seq + "03m"
-codes["underline"] = esc_seq + "04m"
-codes["blink"] = esc_seq + "05m"
-codes["overline"] = esc_seq + "06m"
-codes["reverse"] = esc_seq + "07m"
-codes["invisible"] = esc_seq + "08m"
-
-codes["no-attr"] = esc_seq + "22m"
-codes["no-standout"] = esc_seq + "23m"
-codes["no-underline"] = esc_seq + "24m"
-codes["no-blink"] = esc_seq + "25m"
-codes["no-overline"] = esc_seq + "26m"
-codes["no-reverse"] = esc_seq + "27m"
-
-codes["bg_black"] = esc_seq + "40m"
-codes["bg_darkred"] = esc_seq + "41m"
-codes["bg_darkgreen"] = esc_seq + "42m"
-codes["bg_brown"] = esc_seq + "43m"
-codes["bg_darkblue"] = esc_seq + "44m"
-codes["bg_purple"] = esc_seq + "45m"
-codes["bg_teal"] = esc_seq + "46m"
-codes["bg_lightgray"] = esc_seq + "47m"
-codes["bg_default"] = esc_seq + "49m"
-codes["bg_darkyellow"] = codes["bg_brown"]
+codes = {
+    "normal": f"{esc_seq}0m",
+    "reset": f"{esc_seq}39;49;00m",
+    "bold": f"{esc_seq}01m",
+    "faint": f"{esc_seq}02m",
+    "standout": f"{esc_seq}03m",
+    "underline": f"{esc_seq}04m",
+    "blink": f"{esc_seq}05m",
+    "overline": f"{esc_seq}06m",
+    "reverse": f"{esc_seq}07m",
+    "invisible": f"{esc_seq}08m",
+    "no-attr": f"{esc_seq}22m",
+    "no-standout": f"{esc_seq}23m",
+    "no-underline": f"{esc_seq}24m",
+    "no-blink": f"{esc_seq}25m",
+    "no-overline": f"{esc_seq}26m",
+    "no-reverse": f"{esc_seq}27m",
+    "bg_black": f"{esc_seq}40m",
+    "bg_darkred": f"{esc_seq}41m",
+    "bg_darkgreen": f"{esc_seq}42m",
+    "bg_brown": f"{esc_seq}43m",
+    "bg_darkblue": f"{esc_seq}44m",
+    "bg_purple": f"{esc_seq}45m",
+    "bg_teal": f"{esc_seq}46m",
+    "bg_lightgray": f"{esc_seq}47m",
+    "bg_default": f"{esc_seq}49m",
+    "bg_darkyellow": f"{esc_seq}43m",
+}
 
 
 def color(fg, bg="default", attr=["normal"]):