Merge pull request #4437 from pypa/bugfix/4330

Fix path handling on Windows

news/4330.bugfix.rst

@@ -0,0 +1 @@
+Fix a bug that paths are not normalized before comparison.

news/4436.bugfix.rst

@@ -0,0 +1 @@
+Fix a bug that invalid Python paths from Windows registry break ``pipenv install``.

pipenv/vendor/pythonfinder/__init__.py

@@ -10,7 +10,7 @@ from .exceptions import InvalidPythonVersion
 from .models import SystemPath, WindowsFinder
 from .pythonfinder import Finder
 
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 
 
 logger = logging.getLogger(__name__)

pipenv/vendor/pythonfinder/models/path.py

@@ -302,7 +302,7 @@ class SystemPath(object):
             normalized = normalize_path(current_path)
             if normalized != target:
                 new_order.append(normalized)
-        new_order = [p for p in reversed(new_order)]
+        new_order = [ensure_path(p).as_posix() for p in reversed(new_order)]
         return attr.evolve(self, path_order=new_order, paths=new_paths)
 
     def _setup_asdf(self):

pipenv/vendor/pythonfinder/models/windows.py

@@ -96,7 +96,7 @@ class WindowsFinder(BaseFinder):
                 py_version = PythonVersion.from_windows_launcher(
                     version_object, name=name, company=company
                 )
-            except InvalidPythonVersion:
+            except (InvalidPythonVersion, AttributeError):
                 continue
             if py_version is None:
                 continue

pipenv/vendor/vendor.txt

@@ -20,7 +20,7 @@ pipdeptree==0.13.2
 pipreqs==0.4.10
     docopt==0.6.2
     yarg==0.1.9
-pythonfinder==1.2.4
+pythonfinder==1.2.5
 requests==2.23.0
     chardet==3.0.4
     idna==2.9