Tidy up

Author: hugovk

tests/functional/test_install.py

@@ -5,8 +5,8 @@
 import textwrap
 from os.path import curdir, join, pardir
 
-import pip._vendor.six
 import pytest
+from pip._vendor.six import PY2
 
 from pip._internal import pep425tags
 from pip._internal.cli.status_codes import ERROR, SUCCESS
@@ -20,8 +20,7 @@
 from tests.lib.local_repos import local_checkout
 from tests.lib.path import Path
 
-python3_only = pytest.mark.skipif(not pip._vendor.six.PY2,
-                                  reason="Python 3 only")
+python2_only = pytest.mark.skipif(not PY2, reason="Python 2 only")
 
 
 @pytest.mark.parametrize('command', ('install', 'wheel'))
@@ -532,7 +531,7 @@ def test_editable_install__local_dir_no_setup_py_with_pyproject(
     assert 'A "pyproject.toml" file was found' in msg
 
 
-@python3_only
+@python2_only
 @pytest.mark.xfail
 def test_install_argparse_shadowed(script):
     # When argparse is in the stdlib, we support installing it