Merge pull request pypa#4628 from pypa/bugfix/1902-msvc-vcruntimeredist

Fix TypeError in VCRuntimeRedist

Author: jaraco

newsfragments/1902.bugfix.rst

@@ -0,0 +1 @@
+Fixed TypeError in ``msvc.EnvironmentInfo.return_env`` when no runtime redistributables are installed.

setuptools/msvc.py

@@ -1375,14 +1375,11 @@ def FSharp(self):
         return [self.si.FSharpInstallDir]
 
     @property
-    def VCRuntimeRedist(self):
+    def VCRuntimeRedist(self) -> str | None:
         """
         Microsoft Visual C++ runtime redistributable dll.
 
-        Return
-        ------
-        str
-            path
+        Returns the first suitable path found or None.
         """
         vcruntime = 'vcruntime%d0.dll' % self.vc_ver
         arch_subdir = self.pi.target_dir(x64=True).strip('\\')
@@ -1406,11 +1403,11 @@ def VCRuntimeRedist(self):
         )
 
         # vcruntime path
-        for prefix, crt_dir in itertools.product(prefixes, crt_dirs):
-            path = join(prefix, arch_subdir, crt_dir, vcruntime)
-            if isfile(path):
-                return path
-        return None
+        candidate_paths = (
+            join(prefix, arch_subdir, crt_dir, vcruntime)
+            for (prefix, crt_dir) in itertools.product(prefixes, crt_dirs)
+        )
+        return next(filter(isfile, candidate_paths), None)
 
     def return_env(self, exists=True):
         """
@@ -1469,7 +1466,7 @@ def return_env(self, exists=True):
                 exists,
             ),
         )
-        if self.vs_ver >= 14 and isfile(self.VCRuntimeRedist):
+        if self.vs_ver >= 14 and self.VCRuntimeRedist:
             env['py_vcruntime_redist'] = self.VCRuntimeRedist
         return env