From e328ae24dfb61e5d207f1a64f85b9ea949092ed1 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Tue, 13 Nov 2018 01:23:19 -0500 Subject: [PATCH] Fix feedback Signed-off-by: Dan Ryan --- pipenv/vendor/pythonfinder/models/path.py | 6 +++--- pipenv/vendor/pythonfinder/utils.py | 2 +- pipenv/vendor/vendor.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pipenv/vendor/pythonfinder/models/path.py b/pipenv/vendor/pythonfinder/models/path.py index 523f117a..df755fa6 100644 --- a/pipenv/vendor/pythonfinder/models/path.py +++ b/pipenv/vendor/pythonfinder/models/path.py @@ -150,15 +150,15 @@ class SystemPath(object): def _remove_path(self, path): path_copy = reversed(self.path_order[:]) new_order = [] - target = os.path.normcase(os.path.normpath(os.path.abspath(path))) + target = normalize_path(path) path_map = { - os.path.normcase(os.path.normpath(os.path.abspath(pth))): pth + normalize_path(pth): pth for pth in self.paths.keys() } if target in path_map: del self.paths[path_map.get(target)] for current_path in path_copy: - normalized = os.path.normcase(os.path.normpath(os.path.abspath(current_path))) + normalized = normalize_path(current_path) if normalized != target: new_order.append(normalized) new_order = reversed(new_order) diff --git a/pipenv/vendor/pythonfinder/utils.py b/pipenv/vendor/pythonfinder/utils.py index b8714f52..fb932b10 100644 --- a/pipenv/vendor/pythonfinder/utils.py +++ b/pipenv/vendor/pythonfinder/utils.py @@ -114,7 +114,7 @@ def _filter_none(k, v): def normalize_path(path): - return os.path.normpath(os.path.normcase(os.path.abspath(path))) + return os.path.normpath(os.path.normcase(os.path.abspath(str(path)))) @lru_cache(maxsize=1024) diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index c106a59c..62317853 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -34,7 +34,7 @@ requirementslib==1.3.0 pyparsing==2.2.2 pytoml==0.1.19 plette==0.2.2 - tomlkit==0.5.2 + tomlkit==0.4.6 shellingham==1.2.7 six==1.11.0 semver==2.8.1