From b913ae2685b5e516d49345c8af84129009ef4b7d Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Thu, 9 Jul 2020 21:08:15 +0200
Subject: [PATCH] use f-strings in winbuild

---
 winbuild/build_prepare.py | 61 ++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index c17c3e43e..6f9cf4038 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -6,32 +6,32 @@ import sys
 
 
 def cmd_cd(path):
-    return "cd /D {path}".format(**locals())
+    return f"cd /D {path}"
 
 
 def cmd_set(name, value):
-    return "set {name}={value}".format(**locals())
+    return f"set {name}={value}"
 
 
 def cmd_append(name, value):
-    op = "path " if name == "PATH" else "set {name}="
-    return (op + "%{name}%;{value}").format(**locals())
+    op = "path " if name == "PATH" else f"set {name}="
+    return op + f"%{name}%;{value}"
 
 
 def cmd_copy(src, tgt):
-    return 'copy /Y /B "{src}" "{tgt}"'.format(**locals())
+    return f'copy /Y /B "{src}" "{tgt}"'
 
 
 def cmd_xcopy(src, tgt):
-    return 'xcopy /Y /E "{src}" "{tgt}"'.format(**locals())
+    return f'xcopy /Y /E "{src}" "{tgt}"'
 
 
 def cmd_mkdir(path):
-    return 'mkdir "{path}"'.format(**locals())
+    return f'mkdir "{path}"'
 
 
 def cmd_rmdir(path):
-    return 'rmdir /S /Q "{path}"'.format(**locals())
+    return f'rmdir /S /Q "{path}"'
 
 
 def cmd_nmake(makefile=None, target="", params=None):
@@ -44,13 +44,13 @@ def cmd_nmake(makefile=None, target="", params=None):
 
     return " ".join(
         [
-            "{{nmake}}",
+            "{nmake}",
             "-nologo",
-            '-f "{makefile}"' if makefile is not None else "",
-            "{params}",
-            '"{target}"',
+            f'-f "{makefile}"' if makefile is not None else "",
+            f"{params}",
+            f'"{target}"',
         ]
-    ).format(**locals())
+    )
 
 
 def cmd_cmake(params=None, file="."):
@@ -62,15 +62,15 @@ def cmd_cmake(params=None, file="."):
         params = str(params)
     return " ".join(
         [
-            "{{cmake}}",
+            "{cmake}",
             "-DCMAKE_VERBOSE_MAKEFILE=ON",
             "-DCMAKE_RULE_MESSAGES:BOOL=OFF",
             "-DCMAKE_BUILD_TYPE=Release",
-            "{params}",
+            f"{params}",
             '-G "NMake Makefiles"',
-            '"{file}"',
+            f'"{file}"',
         ]
-    ).format(**locals())
+    )
 
 
 def cmd_msbuild(
@@ -78,14 +78,14 @@ def cmd_msbuild(
 ):
     return " ".join(
         [
-            "{{msbuild}}",
-            "{file}",
-            '/t:"{target}"',
-            '/p:Configuration="{configuration}"',
-            "/p:Platform={platform}",
+            "{msbuild}",
+            f"{file}",
+            f'/t:"{target}"',
+            f'/p:Configuration="{configuration}"',
+            f"/p:Platform={platform}",
             "/m",
         ]
-    ).format(**locals())
+    )
 
 
 SF_MIRROR = "http://iweb.dl.sourceforge.net"
@@ -336,12 +336,12 @@ def find_msvs():
     # vs2017
     msbuild = os.path.join(vspath, "MSBuild", "15.0", "Bin", "MSBuild.exe")
     if os.path.isfile(msbuild):
-        vs["msbuild"] = '"{}"'.format(msbuild)
+        vs["msbuild"] = f'"{msbuild}"'
     else:
         # vs2019
         msbuild = os.path.join(vspath, "MSBuild", "Current", "Bin", "MSBuild.exe")
         if os.path.isfile(msbuild):
-            vs["msbuild"] = '"{}"'.format(msbuild)
+            vs["msbuild"] = f'"{msbuild}"'
         else:
             print("Visual Studio MSBuild not found")
             return None
@@ -350,7 +350,7 @@ def find_msvs():
     if not os.path.isfile(vcvarsall):
         print("Visual Studio vcvarsall not found")
         return None
-    vs["header"].append('call "{}" {{vcvars_arch}}'.format(vcvarsall))
+    vs["header"].append(f'call "{vcvarsall}" {{vcvars_arch}}')
 
     return vs
 
@@ -411,7 +411,7 @@ def get_footer(dep):
 def build_dep(name):
     dep = deps[name]
     dir = dep["dir"]
-    file = "build_dep_{name}.cmd".format(**locals())
+    file = f"build_dep_{name}.cmd"
 
     extract_dep(dep["url"], dep["filename"])
 
@@ -424,10 +424,10 @@ def build_dep(name):
         with open(patch_file, "w") as f:
             f.write(text)
 
-    banner = "Building {name} ({dir})".format(**locals())
+    banner = f"Building {name} ({dir})"
     lines = [
         "@echo " + ("=" * 70),
-        "@echo ==== {:<60} ====".format(banner),
+        f"@echo ==== {banner:<60} ====",
         "@echo " + ("=" * 70),
         "cd /D %s" % os.path.join(build_dir, dir),
         *prefs["header"],
@@ -444,7 +444,8 @@ def build_dep_all():
     for dep_name in deps:
         if dep_name in disabled:
             continue
-        lines.append(r'cmd.exe /c "{{build_dir}}\{}"'.format(build_dep(dep_name)))
+        script = build_dep(dep_name)
+        lines.append(fr'cmd.exe /c "{{build_dir}}\{script}"')
         lines.append("if errorlevel 1 echo Build failed! && exit /B 1")
     lines.append("@echo All Pillow dependencies built successfully!")
     write_script("build_dep_all.cmd", lines)