From 253ce30691b737d364a356d1045f5340b3bee15f Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Thu, 29 Dec 2022 13:58:49 -0500
Subject: [PATCH] Use f-strings and other refactoring

---
 gvsbuild/deps.py                | 30 ++++--------------------------
 gvsbuild/projects/openssl.py    |  7 +++----
 gvsbuild/projects/pixman.py     |  2 +-
 gvsbuild/utils/base_builders.py | 11 +++--------
 gvsbuild/utils/builder.py       |  6 +-----
 gvsbuild/utils/utils.py         |  3 +--
 6 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/gvsbuild/deps.py b/gvsbuild/deps.py
index c522ba93a..185fff0e1 100644
--- a/gvsbuild/deps.py
+++ b/gvsbuild/deps.py
@@ -151,31 +151,15 @@ def make_graph(
                         gr_index %= len(gr_colors)
                         for d in t.dependencies:
                             if d in to_skip:
-                                print(
-                                    "Skip '%s' for '%s'"
-                                    % (
-                                        d,
-                                        n,
-                                    )
-                                )
+                                print(f"Skip '{d}' for '{n}'")
                             else:
                                 if invert_dep:
                                     fo.write(
-                                        '    "%s" -> "%s" [color="#%06x"];\n'
-                                        % (
-                                            d,
-                                            n,
-                                            gr_colors[gr_index],
-                                        )
+                                        f'    "{d}" -> "{n}" [color="#{gr_colors[gr_index]:06x}"];\n'
                                     )
                                 else:
                                     fo.write(
-                                        '    "%s" -> "%s" [color="#%06x"];\n'
-                                        % (
-                                            n,
-                                            d,
-                                            gr_colors[gr_index],
-                                        )
+                                        f'    "{n}" -> "{d}" [color="#{gr_colors[gr_index]:06x}"];\n'
                                     )
                                 used.add(d)
                 else:
@@ -185,13 +169,7 @@ def make_graph(
             # Puts all projects that are not referenced from others
             for n in Project._names:
                 if n not in used:
-                    fo.write(
-                        '    "%s" -> "%s" [color="#c00080"];\n'
-                        % (
-                            "BUILD",
-                            n,
-                        )
-                    )
+                    fo.write(f'    "BUILD" -> "{n}" [color="#c00080"];\n')
 
         fo.write("};\n")
 
diff --git a/gvsbuild/projects/openssl.py b/gvsbuild/projects/openssl.py
index c5b5510a2..0e9d95d18 100644
--- a/gvsbuild/projects/openssl.py
+++ b/gvsbuild/projects/openssl.py
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+import contextlib
+
 from gvsbuild.utils.base_expanders import Tarball
 from gvsbuild.utils.base_project import Project, project_add
 
@@ -61,11 +63,8 @@ def build(self):
                 + common_options
             )
 
-        try:
+        with contextlib.suppress(Exception):
             self.exec_vs(r"nmake /nologo clean", add_path=add_path)
-        except:  # noqa E722
-            pass
-
         self.exec_vs(r"nmake /nologo", add_path=add_path)
         self.exec_vs(r"%(perl_dir)s\bin\perl.exe mk-ca-bundle.pl -n cert.pem")
         self.exec_vs(r"nmake /nologo install", add_path=add_path)
diff --git a/gvsbuild/projects/pixman.py b/gvsbuild/projects/pixman.py
index a0f366c92..7292056f4 100644
--- a/gvsbuild/projects/pixman.py
+++ b/gvsbuild/projects/pixman.py
@@ -41,7 +41,7 @@ def build(self):
         add_path = os.path.join(self.builder.opts.msys_dir, "usr", "bin")
 
         self.exec_vs(
-            r"make -f Makefile.win32 pixman CFG=%(configuration)s " + optimizations,
+            f"make -f Makefile.win32 pixman CFG=%(configuration)s {optimizations}",
             add_path=add_path,
         )
 
diff --git a/gvsbuild/utils/base_builders.py b/gvsbuild/utils/base_builders.py
index ffe25364a..7a9fe39a5 100644
--- a/gvsbuild/utils/base_builders.py
+++ b/gvsbuild/utils/base_builders.py
@@ -94,18 +94,13 @@ def build(
         out_of_source=None,
         source_part=None,
     ):
+        cmake_gen = "Ninja" if use_ninja else "NMake Makefiles"
+
         cmake_config = (
             "Debug" if self.builder.opts.configuration == "debug" else "RelWithDebInfo"
         )
-        cmake_gen = "Ninja" if use_ninja else "NMake Makefiles"
-
         # Create the command for cmake
-        cmd = (
-            'cmake -G "'
-            + cmake_gen
-            + '" -DCMAKE_INSTALL_PREFIX="%(pkg_dir)s" -DGTK_DIR="%(gtk_dir)s" -DCMAKE_BUILD_TYPE='
-            + cmake_config
-        )
+        cmd = f'cmake -G "{cmake_gen}" -DCMAKE_INSTALL_PREFIX="%(pkg_dir)s" -DGTK_DIR="%(gtk_dir)s" -DCMAKE_BUILD_TYPE={cmake_config}'
         if cmake_params:
             cmd += f" {cmake_params}"
         if use_ninja and out_of_source is None:
diff --git a/gvsbuild/utils/builder.py b/gvsbuild/utils/builder.py
index f874408dc..c01051b20 100644
--- a/gvsbuild/utils/builder.py
+++ b/gvsbuild/utils/builder.py
@@ -375,11 +375,7 @@ def __check_good_vs_install(self, opts, vs_path, exit_missing=True):
                 % (vcvars_bat, vs_path, opts.platform)
             )
         return subprocess.check_output(
-            'cmd.exe /c ""%s"%s>NUL && set"'
-            % (
-                vcvars_bat,
-                add_opts,
-            ),
+            f'cmd.exe /c ""{vcvars_bat}"{add_opts}>NUL && set"',
             encoding="utf-8",
             shell=True,
             text=True,
diff --git a/gvsbuild/utils/utils.py b/gvsbuild/utils/utils.py
index 3b7e567ae..40f8131c7 100644
--- a/gvsbuild/utils/utils.py
+++ b/gvsbuild/utils/utils.py
@@ -29,8 +29,7 @@ def convert_to_msys(path):
     path = path
     if path[1] != ":":
         raise NotADirectoryError("Path doesn't contain a drive letter like C:")
-    path = f"/{path[0]}" + path[2:].replace("\\", "/")
-    return path
+    return f"/{path[0]}" + path[2:].replace("\\", "/")
 
 
 def _rmtree_error_handler(func, path, exc_info):