Declare strict mode for zip()

Author: timj

python/lsst/sconsUtils/builders.py

@@ -431,7 +431,7 @@ def _quote_paths(pathList):
         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):
+        for output, path in zip(self.outputs, self.outputPaths, strict=True):
             try:
                 allOutputs.remove(output.lower())
             except Exception:

python/lsst/sconsUtils/scripts.py

@@ -369,7 +369,7 @@ def rewrite_shebang(target, source, env):
             """Copy source to target, rewriting the shebang"""
             # Currently just use this python
             usepython = utils.whichPython()
-            for targ, src in zip(target, source):
+            for targ, src in zip(target, source, strict=True):
                 with open(str(src)) as srcfd:
                     with open(str(targ), "w") as outfd:
                         first_line = srcfd.readline()
@@ -642,7 +642,7 @@ def tests(
         if swigSrc is None:
             swigSrc = {}
         allSwigSrc = set()
-        for name, node in zip(swigNameList, swigFileList):
+        for name, node in zip(swigNameList, swigFileList, strict=True):
             src = swigSrc.setdefault(name, [])
             allSwigSrc.update(str(element) for element in src)
             src.append(node)
@@ -760,7 +760,7 @@ def examples(ccList=None, swigNameList=None, swigSrc=None):
         if swigSrc is None:
             swigSrc = {}
         allSwigSrc = set()
-        for name, node in zip(swigNameList, swigFileList):
+        for name, node in zip(swigNameList, swigFileList, strict=True):
             src = swigSrc.setdefault(name, [])
             allSwigSrc.update(str(element) for element in src)
             src.append(node)