From 934d6707b1d8c55c930d458e39b11038e9276a4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 22:07:30 -0400
Subject: Extract method for finding .Net in the framework folder. Ref #995.

---
 setuptools/msvc.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'setuptools/msvc.py')

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index cf556ad3..1588cd2e 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -753,17 +753,9 @@ class SystemInfo:
             Platform number of bits: 32 or 64.
         """
         # Find actual .NET version in registry
-        ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits) or ''
-
-        # If nothing in registry, look in Framework folder
-        if not ver:
-            dot_net_dir = (self.FrameworkDir32 if bits == 32 else
-                           self.FrameworkDir64)
-            for dir_name in reversed(os.listdir(dot_net_dir)):
-                if (os.path.isdir(os.path.join(dot_net_dir, dir_name)) and
-                        dir_name.startswith('v')):
-                    ver = dir_name
-                    break
+        reg_ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits)
+        dot_net_dir = getattr(self, 'FrameworkDir%d' % bits)
+        ver = reg_ver or self._find_dot_net_in(dot_net_dir) or ''
 
         # Set .NET versions for specified MSVC++ version
         if self.vc_ver >= 12.0:
@@ -777,6 +769,18 @@ class SystemInfo:
             frameworkver = ('v3.0', 'v2.0.50727')
         return frameworkver
 
+    def _find_dot_net_in(self, dot_net_dir):
+        """
+        Find .Net in the Framework folder
+        """
+        matching_dirs = (
+            dir_name
+            for dir_name in reversed(os.listdir(dot_net_dir))
+            if os.path.isdir(os.path.join(dot_net_dir, dir_name))
+            and dir_name.startswith('v')
+        )
+        return next(matching_dirs, None)
+
 
 class EnvironmentInfo:
     """
-- 
cgit v1.2.3