Use f-strings instead of %

Author: arichardson

pycheribuild/projects/cross/dlmalloc.py

@@ -83,13 +83,13 @@ def setup(self):
             self.CFLAGS.append("-DCAPREVOKE")
 
         if self.qmabs:
-            self.CFLAGS.append("-DDEFAULT_MAX_FREEBUFBYTES=%d" % self.qmabs)
+            self.CFLAGS.append(f"-DDEFAULT_MAX_FREEBUFBYTES={self.qmabs}")
 
         if self.qmratio:
-            self.CFLAGS.append("-DDEFAULT_FREEBUF_PERCENT=%f" % self.qmratio)
+            self.CFLAGS.append(f"-DDEFAULT_FREEBUF_PERCENT={self.qmratio:f}")
 
         if self.qmmin:
-            self.CFLAGS.append("-DDEFAULT_MIN_FREEBUFBYTES=%d" % self.qmmin)
+            self.CFLAGS.append(f"-DDEFAULT_MIN_FREEBUFBYTES={self.qmmin}")
 
         if self.consolidate_on_free:
             self.CFLAGS.append("-DCONSOLIDATE_ON_FREE=1")
@@ -107,7 +107,7 @@ def setup(self):
             self.CFLAGS.append("-DSUPPORT_UNMAP=0")
 
         if self.unmap_threshold:
-            self.CFLAGS.append("-DDEFAULT_UNMAP_THRESHOLD=%d" % self.unmap_threshold)
+            self.CFLAGS.append(f"-DDEFAULT_UNMAP_THRESHOLD={self.unmap_threshold}")
 
         if not self.quar_unsafe:
             self.CFLAGS.append("-DSAFE_FREEBUF")

pycheribuild/projects/cross/snmalloc.py

@@ -112,7 +112,7 @@ def __init__(self, *args, **kwargs):
         )
 
         if self.decommit is not None:
-            self.COMMON_FLAGS.append("-DUSE_DECOMMIT_STRATEGY=%s" % self.decommit)
+            self.COMMON_FLAGS.append(f"-DUSE_DECOMMIT_STRATEGY={self.decommit}")
 
         if self.qpathresh is not None:
             self.COMMON_FLAGS.append("-DSNMALLOC_QUARANTINE_PER_ALLOC_THRESHOLD=%d" % self.qpathresh)

pycheribuild/projects/run_fvp.py

@@ -814,11 +814,11 @@ def add_hostbridge_params(*params):
                     continue
                 hg = x.split("=")
                 if len(hg) != 2:
-                    self.fatal("Bad extra-tcp-forwarding (not just one '=' in '%s')" % x)
+                    self.fatal(f"Bad extra-tcp-forwarding (not just one '=' in '{x}')")
                     continue
                 gaddrport = hg[1].split(":")
                 if len(gaddrport) > 2:
-                    self.fatal("Bad extra-tcp-forwarding (excess ':' in '%s')" % x)
+                    self.fatal(f"Bad extra-tcp-forwarding (excess ':' in '{x}')")
                     continue
                 tcp_ports += gaddrport[-1]  # either just port or last in "host:port".split(":")
 

pycheribuild/projects/run_qemu.py

@@ -512,7 +512,7 @@ def add_smb_or_9p_dir(directory, target, share_name=None, readonly=False):
             # QEMU insists on having : field delimeters; add if not given
             hg = x.split("=")
             if len(hg) != 2:
-                self.fatal("Bad extra-tcp-forwarding (not just one '=' in '%s')" % x)
+                self.fatal(f"Bad extra-tcp-forwarding (not just one '=' in '{x}')")
             (h, g) = hg
             if ":" not in h:
                 h = ":" + h

pycheribuild/projects/sdk.py

@@ -95,7 +95,7 @@ def build_cheridis(self):
         self.makedirs(self.config.cheri_sdk_bindir)
         self.run_cmd(
             "cc",
-            '-DLLVM_PATH="%s/"' % str(self.config.cheri_sdk_bindir),
+            f'-DLLVM_PATH="{self.config.cheri_sdk_bindir}/"',
             "-x",
             "c",
             "-",