Replace some more %-formatting with f-strings

Author: timj

bin.src/makeLinkFarm

@@ -29,7 +29,7 @@ def linkFiles(dstDir, srcDir, verbose=0, force=False):
                 if force:
                     os.unlink(fullDst)
                 else:
-                    print("%s already exists; use --force to overwrite" % fullDst, file=sys.stderr)
+                    print(f"{fullDst} already exists; use --force to overwrite", file=sys.stderr)
                     sys.exit(1)
 
             os.symlink(fullSrc, fullDst)
@@ -58,7 +58,7 @@ creates a link farm for your current selection of products.
     linkFarmDir = os.path.abspath(args.linkFarmDir)
 
     if not args.force and os.path.exists(linkFarmDir):
-        print("Path %s already exists; use --force to overwrite" % args.linkFarmDir, file=sys.stderr)
+        print(f"Path {args.linkFarmDir} already exists; use --force to overwrite", file=sys.stderr)
         sys.exit(1)
 
     #
@@ -88,7 +88,7 @@ creates a link farm for your current selection of products.
 
         if args.verbose:
             if args.verbose > 1 or os.path.exists(binDir) or os.path.exists(incDir) or os.path.exists(libDir):
-                print("%-15s %s" % (productName, pd))
+                print(f"{productName:<15} {pd}")
 
         if os.path.exists(binDir):
             fullDstDir = os.path.join(linkFarmDir, "bin")
@@ -111,7 +111,7 @@ creates a link farm for your current selection of products.
                     if args.force:
                         os.unlink(fullDst)
                     else:
-                        print("%s already exists; use --force to overwrite" % fullDst, file=sys.stderr)
+                        print(f"{fullDst} already exists; use --force to overwrite", file=sys.stderr)
                         sys.exit(1)
 
                 os.symlink(fullSrc, fullDst)

bin.src/sconsOpts

@@ -41,6 +41,6 @@ if os.path.exists(args.configFile):
 
 else:
     if not args.quiet:
-        print("File %s doesn't exist" % args.configFile, file=sys.stderr)
+        print(f"File {args.configFile} doesn't exist", file=sys.stderr)
 
 print(f"cc={cc} opt={opt}")

python/lsst/sconsUtils/builders.py

@@ -97,7 +97,7 @@ def SourcesForSharedLibrary(self, files):
     if opt == 0:
         opt = 3
 
-    CCFLAGS_OPT = re.sub(r"-O(\d|s)\s*", "-O%d " % opt, " ".join(self["CCFLAGS"]))
+    CCFLAGS_OPT = re.sub(r"-O(\d|s)\s*", f"-O{opt} ", " ".join(self["CCFLAGS"]))
     CCFLAGS_NOOPT = re.sub(r"-O(\d|s)\s*", "-O0 ", " ".join(self["CCFLAGS"]))  # remove -O flags from CCFLAGS
 
     objs = []
@@ -168,7 +168,7 @@ def filesToTag(root=None, fileRegex=None, ignoreDirs=None):
         #
         for swigFile in [f for f in filenames if f.endswith(".i")]:
             name = os.path.splitext(swigFile)[0]
-            candidates = [f for f in candidates if not re.search(r"%s(_wrap\.cc?|\.py)$" % name, f)]
+            candidates = [f for f in candidates if not re.search(rf"{name}(_wrap\.cc?|\.py)$", f)]
 
         files += [os.path.join(dirpath, f) for f in candidates]
 
@@ -337,7 +337,7 @@ def __call__(self, env, config):
         )
         env.AlwaysBuild(config)
         doc = env.Command(
-            target=self.targets, source=self.sources, action="doxygen %s" % shlex.quote(outConfigNode.abspath)
+            target=self.targets, source=self.sources, action=f"doxygen {shlex.quote(outConfigNode.abspath)}"
         )
         for path in self.outputPaths:
             env.Clean(doc, path)
@@ -406,40 +406,40 @@ def _quote_paths(pathList):
         incFiles = []
         for incPath in self.includes:
             docDir, incFile = os.path.split(incPath)
-            docPaths.append('"%s"' % docDir)
-            incFiles.append('"%s"' % incFile)
+            docPaths.append(f'"{docDir}"')
+            incFiles.append(f'"{incFile}"')
             self.sources.append(SCons.Script.File(incPath))
         if docPaths:
-            outConfigFile.write("@INCLUDE_PATH = %s\n" % _quote_paths(docPaths))
+            outConfigFile.write(f"@INCLUDE_PATH = {_quote_paths(docPaths)}\n")
         for incFile in incFiles:
-            outConfigFile.write("@INCLUDE = %s\n" % _quote_path(incFile))
+            outConfigFile.write(f"@INCLUDE = {_quote_path(incFile)}\n")
 
         for tagPath in self.useTags:
             docDir, tagFile = os.path.split(tagPath)
             htmlDir = os.path.join(docDir, "html")
             outConfigFile.write(f'TAGFILES += "{tagPath}={htmlDir}"\n')
             self.sources.append(SCons.Script.Dir(docDir))
         if self.projectName is not None:
-            outConfigFile.write("PROJECT_NAME = %s\n" % self.projectName)
+            outConfigFile.write(f"PROJECT_NAME = {self.projectName}\n")
         if self.projectNumber is not None:
-            outConfigFile.write("PROJECT_NUMBER = %s\n" % self.projectNumber)
-        outConfigFile.write("INPUT = %s\n" % _quote_paths(self.inputs))
-        outConfigFile.write("EXCLUDE = %s\n" % _quote_paths(self.excludes))
-        outConfigFile.write("FILE_PATTERNS = %s\n" % " ".join(self.patterns))
+            outConfigFile.write(f"PROJECT_NUMBER = {self.projectNumber}\n")
+        outConfigFile.write(f"INPUT = {_quote_paths(self.inputs)}\n")
+        outConfigFile.write(f"EXCLUDE = {_quote_paths(self.excludes)}\n")
+        outConfigFile.write(f"FILE_PATTERNS = {' '.join(self.patterns)}\n")
         outConfigFile.write("RECURSIVE = YES\n" if self.recursive else "RECURSIVE = NO\n")
         allOutputs = {"html", "latex", "man", "rtf", "xml"}
         for output, path in zip(self.outputs, self.outputPaths):
             try:
                 allOutputs.remove(output.lower())
             except Exception:
-                state.log.fail("Unknown Doxygen output format '%s'." % output)
+                state.log.fail(f"Unknown Doxygen output format '{output}'.")
                 state.log.finish()
-            outConfigFile.write("GENERATE_%s = YES\n" % output.upper())
+            outConfigFile.write(f"GENERATE_{output.upper()} = YES\n")
             outConfigFile.write(f"{output.upper()}_OUTPUT = {_quote_path(path.abspath)}\n")
         for output in allOutputs:
-            outConfigFile.write("GENERATE_%s = NO\n" % output.upper())
+            outConfigFile.write(f"GENERATE_{output.upper()} = NO\n")
         if self.makeTag is not None:
-            outConfigFile.write("GENERATE_TAGFILE = %s\n" % _quote_path(self.makeTag))
+            outConfigFile.write(f"GENERATE_TAGFILE = {_quote_path(self.makeTag)}\n")
         #
         # Append the local overrides (usually doxygen.conf.in)
         #
@@ -552,7 +552,7 @@ def VersionModule(self, filename, versionString=None):
             "hg",
             "svn",
         ):
-            if os.path.isdir(".%s" % n):
+            if os.path.isdir(f".{n}"):
                 versionString = n
 
         if not versionString:
@@ -636,7 +636,7 @@ def makeVersionModule(target, source, env):
             outFile.write(")\n")
 
         if calcMd5(target[0].abspath) != oldMd5:  # only print if something's changed
-            state.log.info('makeVersionModule(["%s"], [])' % str(target[0]))
+            state.log.info(f'makeVersionModule(["{target[0]}"], [])')
 
     result = self.Command(filename, [], self.Action(makeVersionModule, strfunction=lambda *args: None))
 

python/lsst/sconsUtils/dependencies.py

@@ -47,7 +47,7 @@ def configure(packageName, versionString=None, eupsProduct=None, eupsProductPath
     """
 
     if not state.env.GetOption("no_progress"):
-        state.log.info("Setting up environment to build package '%s'." % packageName)
+        state.log.info(f"Setting up environment to build package '{packageName}'.")
     if eupsProduct is None:
         eupsProduct = packageName
     if versionString is None:
@@ -65,8 +65,8 @@ def configure(packageName, versionString=None, eupsProduct=None, eupsProductPath
         state.env.linkFarmDir = os.path.abspath(os.path.expanduser(state.env.linkFarmDir))
     prefix = installation.setPrefix(state.env, versionString, eupsProductPath)
     state.env["prefix"] = prefix
-    state.env["libDir"] = "%s/lib" % prefix
-    state.env["pythonDir"] = "%s/python" % prefix
+    state.env["libDir"] = f"{prefix}/lib"
+    state.env["pythonDir"] = f"{prefix}/python"
     #
     # Process dependencies
     #
@@ -97,7 +97,7 @@ def configure(packageName, versionString=None, eupsProduct=None, eupsProductPath
     state.env["XCPPPATH"] = []
 
     if use_conda_compilers():
-        state.env.Append(XCPPPATH=["%s/include" % _conda_prefix])
+        state.env.Append(XCPPPATH=[f"{_conda_prefix}/include"])
 
     # XCPPPPREFIX is a replacement for SCons' built-in INCPREFIX. It is used
     # when compiling headers in XCPPPATH directories. Here, we set it to
@@ -242,10 +242,10 @@ def __init__(
             self.root = os.path.realpath(productDir)
         self.doxygen = {
             # Doxygen tag files generated by this package
-            "tags": ([os.path.join(self.root, "doc", "%s.tag" % self.name)] if hasDoxygenTag else []),
+            "tags": ([os.path.join(self.root, "doc", f"{self.name}.tag")] if hasDoxygenTag else []),
             # Doxygen include files to include in the configuration of
             # dependent products
-            "includes": ([os.path.join(self.root, "doc", "%s.inc" % self.name)] if hasDoxygenInclude else []),
+            "includes": ([os.path.join(self.root, "doc", f"{self.name}.inc")] if hasDoxygenInclude else []),
         }
         if libs is None:
             self.libs = {
@@ -320,7 +320,7 @@ def configure(self, conf, packages, check=False, build=True):
         """
         assert not (check and build)
         conf.env.PrependUnique(**self.paths)
-        state.log.info("Configuring package '%s'." % self.name)
+        state.log.info(f"Configuring package '{self.name}'.")
         conf.env.doxygen["includes"].extend(self.doxygen["includes"])
         if not build:
             conf.env.doxygen["tags"].extend(self.doxygen["tags"])
@@ -558,7 +558,7 @@ def __init__(self, primaryName, noCfgFile=False):
 
         self.primary = self._tryImport(primaryName)
         if self.primary is None:
-            state.log.fail("Failed to load primary package configuration for %s." % primaryName)
+            state.log.fail(f"Failed to load primary package configuration for {primaryName}.")
 
         missingDeps = []
         for dependency in self.primary.dependencies.get("required", ()):
@@ -588,10 +588,10 @@ def configure(self, env, check=False):
         conf = env.Configure(custom_tests=self.customTests)
         for name, module in self.packages.items():
             if module is None:
-                state.log.info("Skipping missing optional package %s." % name)
+                state.log.info(f"Skipping missing optional package {name}.")
                 continue
             if not module.config.configure(conf, packages=self.packages, check=check, build=False):
-                state.log.fail("%s was found but did not pass configuration checks." % name)
+                state.log.fail(f"{name} was found but did not pass configuration checks.")
         if self.primary:
             self.primary.config.configure(conf, packages=self.packages, check=False, build=True)
         env.AppendUnique(SWIGPATH=env["CPPPATH"])
@@ -648,15 +648,15 @@ def _tryImport(self, name):
                     continue
                 state.log.info(f"Using configuration for package '{name}' at '{filename}'.")
                 if not hasattr(module, "dependencies") or not isinstance(module.dependencies, dict):
-                    state.log.warn("Configuration module for package '%s' lacks a dependencies dict." % name)
+                    state.log.warn(f"Configuration module for package '{name}' lacks a dependencies dict.")
                     return None
                 if not hasattr(module, "config") or not isinstance(module.config, Configuration):
-                    state.log.warn("Configuration module for package '%s' lacks a config object." % name)
+                    state.log.warn(f"Configuration module for package '{name}' lacks a config object.")
                     return None
                 else:
                     module.config.addCustomTests(self.customTests)
                 return module
-        state.log.info("Failed to import configuration for optional package '%s'." % name)
+        state.log.info(f"Failed to import configuration for optional package '{name}'.")
 
     def _recurse(self, name):
         """Recursively load a dependency.
@@ -672,7 +672,7 @@ def _recurse(self, name):
             Was the dependency loaded?
         """
         if name in self._current:
-            state.log.fail("Detected recursive dependency involving package '%s'" % name)
+            state.log.fail(f"Detected recursive dependency involving package '{name}'")
         else:
             self._current.add(name)
         if name in self.packages:

python/lsst/sconsUtils/eupsForScons.py

@@ -30,7 +30,7 @@ def flavor():
             return env["PLATFORM"].title()
 
     def productDir(name):
-        return os.environ.get("%s_DIR" % name.upper())
+        return os.environ.get(f"{name.upper()}_DIR")
 
     def findSetupVersion(eupsProduct):
         return None, None, None, None, flavor()
@@ -49,7 +49,7 @@ class _Utils:
     utils = _Utils()
 
     def setupEnvNameFor(productName):
-        return "SETUP_%s" % productName
+        return f"SETUP_{productName}"
 
     utils.setupEnvNameFor = setupEnvNameFor
 

python/lsst/sconsUtils/installation.py

@@ -149,7 +149,7 @@ def setPrefix(env, versionString, eupsProductPath=None):
         env["version"] = "unknown"
         if (env.installing or env.declaring) and not env["force"]:
             state.log.fail(
-                "%s\nFound problem with version number; update or specify force=True to proceed" % err
+                f"{err}\nFound problem with version number; update or specify force=True to proceed"
             )
 
     if state.env["no_eups"]:
@@ -175,7 +175,7 @@ def setPrefix(env, versionString, eupsProductPath=None):
         eupsPrefix = None
     if "prefix" in env:
         if env["version"] != "unknown" and eupsPrefix and eupsPrefix != env["prefix"]:
-            state.log.warn("Ignoring prefix %s from EUPS_PATH" % eupsPrefix)
+            state.log.warn(f"Ignoring prefix {eupsPrefix} from EUPS_PATH")
         return makeProductPath(env, env["prefix"])
     elif "eupsPath" in env and env["eupsPath"]:
         prefix = eupsPrefix
@@ -233,7 +233,7 @@ def Declare(self, products=None):
                 product = self["eupsProduct"]
 
             if "EUPS_DIR" in os.environ:
-                self["ENV"]["PATH"] += os.pathsep + "%s/bin" % (os.environ["EUPS_DIR"])
+                self["ENV"]["PATH"] += os.pathsep + f'{os.environ["EUPS_DIR"]}/bin'
                 self["ENV"]["EUPS_LOCK_PID"] = os.environ.get("EUPS_LOCK_PID", "-1")
                 if "undeclare" in SCons.Script.COMMAND_LINE_TARGETS or self.GetOption("clean"):
                     if version:
@@ -259,15 +259,15 @@ def Declare(self, products=None):
                     )
 
                     if "eupsPath" in self:
-                        command += " -Z %s" % self["eupsPath"]
+                        command += f' -Z {self["eupsPath"]}'
 
                     if version:
                         command += f" {product} {version}"
 
                     current += [command + " --current"]
 
                     if self.GetOption("tag"):
-                        command += " --tag=%s" % self.GetOption("tag")
+                        command += f' --tag={self.GetOption("tag")}'
 
                     declare += [command]
 
@@ -310,7 +310,7 @@ def __call__(self, target, source, env):
         prefix = os.path.abspath(os.path.join(target[0].abspath, ".."))
         destpath = os.path.join(target[0].abspath)
         if not os.path.isdir(destpath):
-            state.log.info("Creating directory %s" % destpath)
+            state.log.info(f"Creating directory {destpath}")
             os.makedirs(destpath)
         for root, dirnames, filenames in os.walk(source[0].path):
             if not self.recursive:
@@ -320,7 +320,7 @@ def __call__(self, target, source, env):
             for dirname in dirnames:
                 destpath = os.path.join(prefix, root, dirname)
                 if not os.path.isdir(destpath):
-                    state.log.info("Creating directory %s" % destpath)
+                    state.log.info(f"Creating directory {destpath}")
                     os.makedirs(destpath)
             for filename in filenames:
                 if self.ignoreRegex.search(filename):
@@ -454,11 +454,11 @@ def InstallEups(env, dest, files=[], presetup=""):
         for i in build_obj:
             env.AlwaysBuild(i)
 
-            cmd = "eups expandbuild -i --version %s " % env["version"]
+            cmd = f'eups expandbuild -i --version {env["version"]} '
             if "baseversion" in env:
-                cmd += " --repoversion %s " % env["baseversion"]
+                cmd += f' --repoversion {env["baseversion"]} '
             cmd += str(i)
-            eupsTargets.extend(env.AddPostAction(build_obj, env.Action("%s" % (cmd), cmd)))
+            eupsTargets.extend(env.AddPostAction(build_obj, env.Action(f"{cmd}", cmd)))
 
         for i in table_obj:
             env.AlwaysBuild(i)
@@ -468,7 +468,7 @@ def InstallEups(env, dest, files=[], presetup=""):
                 cmd += presetup + " "
             cmd += str(i)
 
-            act = env.Command("table", "", env.Action("%s" % (cmd), cmd))
+            act = env.Command("table", "", env.Action(f"{cmd}", cmd))
             eupsTargets.extend(act)
             acts += act
             env.Depends(act, i)

python/lsst/sconsUtils/scripts.py

@@ -175,7 +175,7 @@ def key(path):
 
         scripts.sort(key=key)
         for script in scripts:
-            state.log.info("Using SConscript at %s" % script)
+            state.log.info(f"Using SConscript at {script}")
             SConscript(script)
         cls._initializing = False
         return state.env
@@ -657,11 +657,11 @@ def s(ll):
                 return ["None"]
             return [str(i) for i in ll]
 
-        state.log.info("SWIG modules for tests: %s" % s(swigFileList))
-        state.log.info("Python tests: %s" % s(pyList))
-        state.log.info("C++ tests: %s" % s(ccList))
-        state.log.info("Files that will not be built: %s" % noBuildList)
-        state.log.info("Ignored tests: %s" % ignoreList)
+        state.log.info(f"SWIG modules for tests: {s(swigFileList)}")
+        state.log.info(f"Python tests: {s(pyList)}")
+        state.log.info(f"C++ tests: {s(ccList)}")
+        state.log.info(f"Files that will not be built: {noBuildList}")
+        state.log.info(f"Ignored tests: {ignoreList}")
         control = tests.Control(state.env, ignoreList=ignoreList, args=args, verbose=True)
         for ccTest in ccList:
             state.env.Program(ccTest, LIBS=state.env.getLibs("main test"))
@@ -756,8 +756,8 @@ def examples(ccList=None, swigNameList=None, swigSrc=None):
                 for node in Glob("*.cc")
                 if (not str(node).endswith("_wrap.cc")) and str(node) not in allSwigSrc
             ]
-        state.log.info("SWIG modules for examples: %s" % swigFileList)
-        state.log.info("C++ examples: %s" % ccList)
+        state.log.info(f"SWIG modules for examples: {swigFileList}")
+        state.log.info(f"C++ examples: {ccList}")
         results = []
         for src in ccList:
             results.extend(state.env.Program(src, LIBS=state.env.getLibs("main")))