From 39a363b780308fb83644fdecbb406fa34c8fc9a2 Mon Sep 17 00:00:00 2001
From: Dan Ryan <dan@danryan.co>
Date: Wed, 27 Jun 2018 22:28:31 -0400
Subject: [PATCH] Update references to `Path`

Signed-off-by: Dan Ryan <dan@danryan.co>
---
 tests/integration/conftest.py            | 8 +-------
 tests/integration/test_install_basic.py  | 6 +-----
 tests/integration/test_install_twists.py | 7 ++-----
 tests/integration/test_install_uri.py    | 5 +----
 tests/integration/test_pipenv.py         | 8 ++------
 tests/integration/test_windows.py        | 6 +++---
 6 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 6141eeac..d71f0f89 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -4,18 +4,12 @@ import warnings
 
 import pytest
 
-from pipenv._compat import TemporaryDirectory
+from pipenv._compat import TemporaryDirectory, Path
 from pipenv.vendor import delegator
 from pipenv.vendor import requests
 from pipenv.vendor import six
 from pipenv.vendor import toml
 
-try:
-    from pathlib import Path
-except ImportError:
-    from pipenv.vendor.pathlib2 import Path
-
-
 if six.PY2:
     class ResourceWarning(Warning):
         pass
diff --git a/tests/integration/test_install_basic.py b/tests/integration/test_install_basic.py
index 71e3ed5d..d4e967d4 100644
--- a/tests/integration/test_install_basic.py
+++ b/tests/integration/test_install_basic.py
@@ -2,13 +2,9 @@ import contextlib
 import os
 
 from pipenv.utils import temp_environ
-from pipenv._compat import TemporaryDirectory
+from pipenv._compat import TemporaryDirectory, Path
 from pipenv.vendor import delegator
 from pipenv.project import Project
-try:
-    from pathlib import Path
-except ImportError:
-    from pipenv.vendor.pathlib2 import Path
 
 import pytest
 
diff --git a/tests/integration/test_install_twists.py b/tests/integration/test_install_twists.py
index 8750d463..95d67daf 100644
--- a/tests/integration/test_install_twists.py
+++ b/tests/integration/test_install_twists.py
@@ -1,10 +1,7 @@
 import os
 import shutil
 from pipenv.project import Project
-try:
-    import pathlib
-except ImportError:
-    import pathlib2 as pathlib
+from pipenv._compat import Path
 
 from pipenv.utils import mkdir_p, temp_environ
 
@@ -223,7 +220,7 @@ def test_relative_paths(PipenvInstance, pypi, testsroot):
         dep = p.pipfile['packages'][key]
 
         assert 'path' in dep
-        assert pathlib.Path('.', artifact_dir, file_name) == pathlib.Path(dep['path'])
+        assert Path('.', artifact_dir, file_name) == Path(dep['path'])
         assert c.return_code == 0
 
 
diff --git a/tests/integration/test_install_uri.py b/tests/integration/test_install_uri.py
index 709ba8eb..df2d44d8 100644
--- a/tests/integration/test_install_uri.py
+++ b/tests/integration/test_install_uri.py
@@ -2,10 +2,7 @@ import pytest
 import os
 from flaky import flaky
 import delegator
-try:
-    from pathlib import Path
-except ImportError:
-    from pathlib2 import Path
+from pipenv._compat import Path
 
 
 @pytest.mark.vcs
diff --git a/tests/integration/test_pipenv.py b/tests/integration/test_pipenv.py
index 7077d6e7..89ee793e 100644
--- a/tests/integration/test_pipenv.py
+++ b/tests/integration/test_pipenv.py
@@ -11,11 +11,7 @@ import pytest
 from pipenv.core import activate_virtualenv
 from pipenv.project import Project
 from pipenv.vendor import delegator
-
-try:
-    from pathlib import Path
-except ImportError:
-    from pipenv.vendor.pathlib2 import Path
+from pipenv._compat import Path
 
 
 @pytest.mark.code
@@ -123,4 +119,4 @@ def test_directory_with_leading_dash(PipenvInstance):
             assert os.path.isdir(venv_path)
             # Manually clean up environment, since PipenvInstance assumes that
             # the virutalenv is in the project directory.
-            p.pipenv('--rm')
\ No newline at end of file
+            p.pipenv('--rm')
diff --git a/tests/integration/test_windows.py b/tests/integration/test_windows.py
index 91b4f995..bd6eaf19 100644
--- a/tests/integration/test_windows.py
+++ b/tests/integration/test_windows.py
@@ -1,7 +1,7 @@
 import os
 
 from pipenv.project import Project
-from pipenv.vendor import pathlib2 as pathlib
+from pipenv._compat import Path
 
 import pytest
 
@@ -33,7 +33,7 @@ def test_case_changes_windows(PipenvInstance, pypi):
 @pytest.mark.files
 def test_local_path_windows(PipenvInstance, pypi):
     whl = (
-        pathlib.Path(__file__).parent.parent
+        Path(__file__).parent.parent
         .joinpath('pypi', 'six', 'six-1.11.0-py2.py3-none-any.whl')
     )
     try:
@@ -48,7 +48,7 @@ def test_local_path_windows(PipenvInstance, pypi):
 @pytest.mark.files
 def test_local_path_windows_forward_slash(PipenvInstance, pypi):
     whl = (
-        pathlib.Path(__file__).parent.parent
+        Path(__file__).parent.parent
         .joinpath('pypi', 'six', 'six-1.11.0-py2.py3-none-any.whl')
     )
     try: