Windows fix

Signed-off-by: Dan Ryan <[email protected]>
pypa · Jul 16, 2018 · ff985cc · ff985cc
1 parent 0e3af57
commit ff985cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/pipenv/vendor/pythonfinder/models/windows.py b/pipenv/vendor/pythonfinder/models/windows.py
@@ -24,21 +24,13 @@ def find_all_python_versions(self, major=None, minor=None, patch=None, pre=None,
             None, filter(lambda c: version_matcher(c), self.version_list)
         )
         version_sort = operator.attrgetter("version_sort")
-        for c in sorted(py_filter, key=version_sort, reverse=True):
-            yield c.comes_from
+        return [c.comes_from for c in sorted(py_filter, key=version_sort, reverse=True)]
 
     def find_python_version(self, major=None, minor=None, patch=None, pre=None, dev=None):
-        # version_matcher = operator.methodcaller(
-        #     "matches", major=major, minor=minor, patch=patch, pre=pre, dev=dev
-        # )
-        # py_filter = filter(
-        #     None, filter(lambda c: version_matcher(c), self.version_list)
-        # )
-        # version_sort = operator.attrgetter("version_sort")
-        return next(
-            self.find_all_python_versions(
+        return next((
+            v for v in self.find_all_python_versions(
                 major=major, minor=minor, patch=patch, pre=pre, dev=dev
-            ), None
+            )), None
         )
 
     @versions.default

diff --git a/pipenv/vendor/pythonfinder/pythonfinder.py b/pipenv/vendor/pythonfinder/pythonfinder.py
@@ -71,8 +71,9 @@ def find_python_version(self, major, minor=None, patch=None, pre=None, dev=None)
 
     def find_all_python_versions(self, major=None, minor=None, patch=None, pre=None, dev=None):
         version_sort = operator.attrgetter("as_python.version_sort")
-        versions = self.system_path.find_all_python_versions(major=major, minor=minor, patch=patch, pre=pre, dev=dev)
+        versions = []
+        versions.extend([p for p in self.system_path.find_all_python_versions(major=major, minor=minor, patch=patch, pre=pre, dev=dev)])
         if os.name == 'nt':
             windows_versions = self.windows_finder.find_all_python_versions(major=major, minor=minor, patch=patch, pre=pre, dev=dev)
-            versions = list(versions) + list(windows_versions)
+            versions = versions + list(windows_versions)
         return sorted(versions, key=version_sort, reverse=True)