From 9923c1ad7eef7be337f417ca28014a7499c76083 Mon Sep 17 00:00:00 2001
From: "Pradyun S. Gedam" <pradyunsg@users.noreply.github.com>
Date: Tue, 13 Jun 2017 17:47:00 +0530
Subject: [PATCH] Sort imports and minor Flake8 changes (#4520)

* Run isort on the codebase

Command: isort --recursive --skip __main__.py --skip _vendor -o pip._vendor -sd THIRDPARTY -m 5 -p pip -p tests ./pip ./tests

* :newspaper:
---
 news/4520.trivial                        |   1 +
 pip/commands/download.py                 |   2 +-
 pip/commands/install.py                  |  12 +++++++-----
 pip/compat.py                            |   4 ++--
 pip/utils/temp_dir.py                    |   1 -
 pip/vcs/bazaar.py                        |   1 -
 pip/vcs/mercurial.py                     |   2 +-
 pip/wheel.py                             |  19 ++++++++-----------
 tests/conftest.py                        |   2 +-
 tests/data/packages/symlinks/docs        | Bin 3 -> 14 bytes
 tests/data/src/pep518-3.0/setup.py       |   2 +-
 tests/functional/test_download.py        |   1 +
 tests/functional/test_freeze.py          |   1 +
 tests/functional/test_help.py            |   1 +
 tests/functional/test_install.py         |   1 +
 tests/functional/test_install_cleanup.py |   1 +
 tests/functional/test_install_compat.py  |   1 +
 tests/functional/test_install_reqs.py    |   1 +
 tests/functional/test_install_upgrade.py |   1 +
 tests/functional/test_install_user.py    |   1 +
 tests/functional/test_install_vcs.py     |   1 +
 tests/functional/test_install_vcs_git.py |   1 +
 tests/functional/test_install_vcs_svn.py |   1 +
 tests/functional/test_install_wheel.py   |   1 +
 tests/functional/test_search.py          |   1 +
 tests/functional/test_show.py            |   1 +
 tests/functional/test_uninstall.py       |   1 +
 tests/functional/test_uninstall_user.py  |   1 +
 tests/functional/test_wheel.py           |   1 +
 tests/unit/test_appdirs.py               |   1 +
 tests/unit/test_compat.py                |   6 ++++--
 tests/unit/test_download.py              |   4 ++--
 tests/unit/test_finder.py                |   4 ++--
 tests/unit/test_index.py                 |   1 +
 tests/unit/test_locations.py             |   1 +
 tests/unit/test_options.py               |   3 ++-
 tests/unit/test_pep425tags.py            |   1 +
 tests/unit/test_req.py                   |   4 ++--
 tests/unit/test_req_file.py              |   5 +++--
 tests/unit/test_req_install.py           |   1 +
 tests/unit/test_req_uninstall.py         |   3 ++-
 tests/unit/test_unit_outdated.py         |   4 ++--
 tests/unit/test_utils.py                 |   6 +++---
 tests/unit/test_vcs.py                   |   4 ++--
 tests/unit/test_wheel.py                 |   4 ++--
 45 files changed, 71 insertions(+), 45 deletions(-)
 create mode 100644 news/4520.trivial
 mode change 120000 => 100644 tests/data/packages/symlinks/docs

diff --git a/news/4520.trivial b/news/4520.trivial
new file mode 100644
index 000000000..c93f1e3ff
--- /dev/null
+++ b/news/4520.trivial
@@ -0,0 +1 @@
+Sort imports, again.
diff --git a/pip/commands/download.py b/pip/commands/download.py
index 1824ba4e1..22bde7467 100644
--- a/pip/commands/download.py
+++ b/pip/commands/download.py
@@ -9,8 +9,8 @@ from pip.exceptions import CommandError
 from pip.index import FormatControl
 from pip.req import RequirementSet
 from pip.utils import ensure_dir, normalize_path
-from pip.utils.temp_dir import TempDirectory
 from pip.utils.filesystem import check_path_owner
+from pip.utils.temp_dir import TempDirectory
 
 logger = logging.getLogger(__name__)
 
diff --git a/pip/commands/install.py b/pip/commands/install.py
index 20c1d1eaf..3c5f994f0 100644
--- a/pip/commands/install.py
+++ b/pip/commands/install.py
@@ -5,10 +5,6 @@ import logging
 import operator
 import os
 import shutil
-try:
-    import wheel
-except ImportError:
-    wheel = None
 
 from pip import cmdoptions
 from pip.basecommand import RequirementCommand
@@ -19,8 +15,8 @@ from pip.locations import distutils_scheme, virtualenv_no_global
 from pip.req import RequirementSet
 from pip.status_codes import ERROR
 from pip.utils import ensure_dir, get_installed_version
-from pip.utils.temp_dir import TempDirectory
 from pip.utils.filesystem import check_path_owner
+from pip.utils.temp_dir import TempDirectory
 from pip.wheel import WheelBuilder, WheelCache
 
 try:
@@ -29,6 +25,12 @@ except ImportError:
     wheel = None
 
 
+try:
+    import wheel
+except ImportError:
+    wheel = None
+
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/pip/compat.py b/pip/compat.py
index 71bf8e622..8018b2c8f 100644
--- a/pip/compat.py
+++ b/pip/compat.py
@@ -2,11 +2,11 @@
 distributions."""
 from __future__ import absolute_import, division
 
-import os
-import sys
 import codecs
 import locale
 import logging
+import os
+import sys
 
 from pip._vendor.six import text_type
 
diff --git a/pip/utils/temp_dir.py b/pip/utils/temp_dir.py
index 01d16f9c3..d3307d516 100644
--- a/pip/utils/temp_dir.py
+++ b/pip/utils/temp_dir.py
@@ -6,7 +6,6 @@ import tempfile
 
 from pip.utils import rmtree
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/pip/vcs/bazaar.py b/pip/vcs/bazaar.py
index c1a968960..8a53d7415 100644
--- a/pip/vcs/bazaar.py
+++ b/pip/vcs/bazaar.py
@@ -10,7 +10,6 @@ from pip.utils import display_path, rmtree
 from pip.utils.temp_dir import TempDirectory
 from pip.vcs import VersionControl, vcs
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/pip/vcs/mercurial.py b/pip/vcs/mercurial.py
index 00206be7e..7d38d1bf8 100644
--- a/pip/vcs/mercurial.py
+++ b/pip/vcs/mercurial.py
@@ -8,7 +8,7 @@ from pip._vendor.six.moves import configparser
 from pip.download import path_to_url
 from pip.utils import display_path
 from pip.utils.temp_dir import TempDirectory
-from pip.vcs import vcs, VersionControl
+from pip.vcs import VersionControl, vcs
 
 logger = logging.getLogger(__name__)
 
diff --git a/pip/wheel.py b/pip/wheel.py
index 9cd7c6bec..83ce820be 100644
--- a/pip/wheel.py
+++ b/pip/wheel.py
@@ -18,6 +18,12 @@ import sys
 import warnings
 from base64 import urlsafe_b64encode
 from email.parser import Parser
+from sysconfig import get_paths
+
+from pip._vendor import pkg_resources, pytoml
+from pip._vendor.distlib.scripts import ScriptMaker
+from pip._vendor.packaging.utils import canonicalize_name
+from pip._vendor.six import StringIO
 
 import pip
 from pip import pep425tags
@@ -27,20 +33,11 @@ from pip.exceptions import (
     InstallationError, InvalidWheelFilename, UnsupportedWheel
 )
 from pip.locations import PIP_DELETE_MARKER_FILENAME, distutils_scheme
-from pip.utils import (
-    call_subprocess, captured_stdout, ensure_dir, read_chunks
-)
+from pip.utils import call_subprocess, captured_stdout, ensure_dir, read_chunks
 from pip.utils.logging import indent_log
-from pip.utils.temp_dir import TempDirectory
 from pip.utils.setuptools_build import SETUPTOOLS_SHIM
+from pip.utils.temp_dir import TempDirectory
 from pip.utils.ui import open_spinner
-from pip._vendor.distlib.scripts import ScriptMaker
-from pip._vendor import pkg_resources
-from pip._vendor.packaging.utils import canonicalize_name
-from pip._vendor import pytoml
-from pip._vendor.six import StringIO
-
-from sysconfig import get_paths
 
 wheel_ext = '.whl'
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 193ce5b19..5a96a2ff9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,10 +3,10 @@ import os
 import shutil
 import sys
 
+import pytest
 import six
 
 import pip
-import pytest
 from pip.utils import appdirs
 from tests.lib import SRC_DIR, TestData
 from tests.lib.path import Path
diff --git a/tests/data/packages/symlinks/docs b/tests/data/packages/symlinks/docs
deleted file mode 120000
index 325ab0db6..000000000
--- a/tests/data/packages/symlinks/docs
+++ /dev/null
@@ -1 +0,0 @@
-doc
\ No newline at end of file
diff --git a/tests/data/packages/symlinks/docs b/tests/data/packages/symlinks/docs
new file mode 100644
index 0000000000000000000000000000000000000000..b445d90d99c000d6865af326a5a0ebbf02fa6d15
GIT binary patch
literal 14
VcmeawE2;4D^JYw8$Y)4q001E=1Hb?P

literal 0
HcmV?d00001

diff --git a/tests/data/src/pep518-3.0/setup.py b/tests/data/src/pep518-3.0/setup.py
index 7ff29e276..f9d4c4891 100644
--- a/tests/data/src/pep518-3.0/setup.py
+++ b/tests/data/src/pep518-3.0/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 setup(name='pep518',
       version='3.0',
diff --git a/tests/functional/test_download.py b/tests/functional/test_download.py
index 305ce8a73..b227868b7 100644
--- a/tests/functional/test_download.py
+++ b/tests/functional/test_download.py
@@ -2,6 +2,7 @@ import os
 import textwrap
 
 import pytest
+
 from pip.status_codes import ERROR
 from tests.lib.path import Path
 
diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
index a26a7c51d..4569e9ac1 100644
--- a/tests/functional/test_freeze.py
+++ b/tests/functional/test_freeze.py
@@ -5,6 +5,7 @@ import textwrap
 from doctest import ELLIPSIS, OutputChecker
 
 import pytest
+
 from tests.lib import _create_test_package, _create_test_package_with_srcdir
 
 distribute_re = re.compile('^distribute==[0-9.]+\n', re.MULTILINE)
diff --git a/tests/functional/test_help.py b/tests/functional/test_help.py
index 862319c11..04a50b4c6 100644
--- a/tests/functional/test_help.py
+++ b/tests/functional/test_help.py
@@ -1,5 +1,6 @@
 import pytest
 from mock import Mock
+
 from pip.basecommand import ERROR, SUCCESS
 from pip.commands import commands_dict as commands
 from pip.commands.help import HelpCommand
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 6d1cf014e..2ee4bc21e 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -5,6 +5,7 @@ import textwrap
 from os.path import curdir, join, pardir
 
 import pytest
+
 from pip import pep425tags
 from pip.status_codes import ERROR
 from pip.utils import appdirs, rmtree
diff --git a/tests/functional/test_install_cleanup.py b/tests/functional/test_install_cleanup.py
index 36dfedf69..79fff57e2 100644
--- a/tests/functional/test_install_cleanup.py
+++ b/tests/functional/test_install_cleanup.py
@@ -2,6 +2,7 @@ import os
 from os.path import exists
 
 import pytest
+
 from pip.locations import write_delete_marker_file
 from pip.status_codes import PREVIOUS_BUILD_DIR_ERROR
 from tests.lib.local_repos import local_checkout
diff --git a/tests/functional/test_install_compat.py b/tests/functional/test_install_compat.py
index a16f2e4b9..6a36da334 100644
--- a/tests/functional/test_install_compat.py
+++ b/tests/functional/test_install_compat.py
@@ -5,6 +5,7 @@ Tests for compatibility workarounds.
 import os
 
 import pytest
+
 from tests.lib import assert_all_changes, pyversion
 
 
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 18eebc187..7d8d9a66e 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -2,6 +2,7 @@ import os.path
 import textwrap
 
 import pytest
+
 from tests.lib import (
     _create_test_package_with_subdirectory, pyversion, requirements_file
 )
diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py
index ec4184eeb..c477771d8 100644
--- a/tests/functional/test_install_upgrade.py
+++ b/tests/functional/test_install_upgrade.py
@@ -3,6 +3,7 @@ import sys
 import textwrap
 
 import pytest
+
 from tests.lib import assert_all_changes, pyversion
 from tests.lib.local_repos import local_checkout
 
diff --git a/tests/functional/test_install_user.py b/tests/functional/test_install_user.py
index d3a90fcc6..6faea6149 100644
--- a/tests/functional/test_install_user.py
+++ b/tests/functional/test_install_user.py
@@ -6,6 +6,7 @@ import textwrap
 from os.path import curdir, isdir, isfile
 
 import pytest
+
 from pip.compat import cache_from_source, uses_pycache
 from tests.lib import pyversion
 from tests.lib.local_repos import local_checkout
diff --git a/tests/functional/test_install_vcs.py b/tests/functional/test_install_vcs.py
index 220790408..d8175331e 100644
--- a/tests/functional/test_install_vcs.py
+++ b/tests/functional/test_install_vcs.py
@@ -1,4 +1,5 @@
 import pytest
+
 from tests.lib import (
     _change_test_package_version, _create_test_package, pyversion
 )
diff --git a/tests/functional/test_install_vcs_git.py b/tests/functional/test_install_vcs_git.py
index be200762c..b970c27c4 100644
--- a/tests/functional/test_install_vcs_git.py
+++ b/tests/functional/test_install_vcs_git.py
@@ -1,5 +1,6 @@
 import pytest
 from mock import patch
+
 from pip.vcs.git import Git
 from tests.lib import _create_test_package
 from tests.lib.git_submodule_helpers import (
diff --git a/tests/functional/test_install_vcs_svn.py b/tests/functional/test_install_vcs_svn.py
index 437d7d82e..b508d07ad 100644
--- a/tests/functional/test_install_vcs_svn.py
+++ b/tests/functional/test_install_vcs_svn.py
@@ -1,5 +1,6 @@
 import pytest
 from mock import patch
+
 from pip.vcs.subversion import Subversion
 
 
diff --git a/tests/functional/test_install_wheel.py b/tests/functional/test_install_wheel.py
index 346957433..d5f15d5c7 100644
--- a/tests/functional/test_install_wheel.py
+++ b/tests/functional/test_install_wheel.py
@@ -3,6 +3,7 @@ import os
 import sys
 
 import pytest
+
 from tests.lib.path import Path
 
 
diff --git a/tests/functional/test_search.py b/tests/functional/test_search.py
index a00460f01..548280b12 100644
--- a/tests/functional/test_search.py
+++ b/tests/functional/test_search.py
@@ -1,4 +1,5 @@
 import pytest
+
 from pip.commands.search import (
     SearchCommand, highest_version, print_results, transform_hits
 )
diff --git a/tests/functional/test_show.py b/tests/functional/test_show.py
index 659f5d9ee..cd168fece 100644
--- a/tests/functional/test_show.py
+++ b/tests/functional/test_show.py
@@ -1,6 +1,7 @@
 import re
 
 import pytest
+
 from pip import __version__
 from pip.commands.show import search_packages_info
 
diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py
index cbcfac4aa..c0fc37348 100644
--- a/tests/functional/test_uninstall.py
+++ b/tests/functional/test_uninstall.py
@@ -9,6 +9,7 @@ from tempfile import mkdtemp
 
 import pretend
 import pytest
+
 from pip.req import InstallRequirement
 from pip.utils import rmtree
 from tests.lib import assert_all_changes, create_test_package_with_setup
diff --git a/tests/functional/test_uninstall_user.py b/tests/functional/test_uninstall_user.py
index ddf21a35d..ae865a67c 100644
--- a/tests/functional/test_uninstall_user.py
+++ b/tests/functional/test_uninstall_user.py
@@ -4,6 +4,7 @@ tests specific to uninstalling --user installs
 from os.path import isdir, isfile
 
 import pytest
+
 from tests.functional.test_install_user import _patch_dist_in_site_packages
 from tests.lib import assert_all_changes, pyversion
 
diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py
index f776b23d2..d5e05187a 100644
--- a/tests/functional/test_wheel.py
+++ b/tests/functional/test_wheel.py
@@ -3,6 +3,7 @@ import os
 from os.path import exists
 
 import pytest
+
 from pip.locations import write_delete_marker_file
 from pip.status_codes import ERROR, PREVIOUS_BUILD_DIR_ERROR
 from tests.lib import pyversion
diff --git a/tests/unit/test_appdirs.py b/tests/unit/test_appdirs.py
index a408fb49d..570e3b228 100644
--- a/tests/unit/test_appdirs.py
+++ b/tests/unit/test_appdirs.py
@@ -4,6 +4,7 @@ import posixpath
 import sys
 
 import pretend
+
 from pip.utils import appdirs
 
 
diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py
index 2e896294f..9e28971ca 100644
--- a/tests/unit/test_compat.py
+++ b/tests/unit/test_compat.py
@@ -1,8 +1,10 @@
 import locale
 import os
-import pip.compat
+
 import pytest
-from pip.compat import expanduser, get_path_uid, native_str, console_to_str
+
+import pip.compat
+from pip.compat import console_to_str, expanduser, get_path_uid, native_str
 
 
 def test_get_path_uid():
diff --git a/tests/unit/test_download.py b/tests/unit/test_download.py
index e6f782cce..1738a4925 100644
--- a/tests/unit/test_download.py
+++ b/tests/unit/test_download.py
@@ -4,11 +4,11 @@ from io import BytesIO
 from shutil import copy, rmtree
 from tempfile import mkdtemp
 
+import pytest
+from mock import Mock, patch
 from pip._vendor.six.moves.urllib import request as urllib_request
 
 import pip
-import pytest
-from mock import Mock, patch
 from pip.download import (
     MultiDomainBasicAuth, PipSession, SafeFileCache, path_to_url,
     unpack_file_url, unpack_http_url, url_to_path
diff --git a/tests/unit/test_finder.py b/tests/unit/test_finder.py
index 732748f9c..638d1f9cd 100644
--- a/tests/unit/test_finder.py
+++ b/tests/unit/test_finder.py
@@ -1,11 +1,11 @@
 import sys
 
+import pytest
+from mock import Mock, patch
 from pkg_resources import Distribution, parse_version
 
 import pip.pep425tags
 import pip.wheel
-import pytest
-from mock import Mock, patch
 from pip.download import PipSession
 from pip.exceptions import BestVersionAlreadyInstalled, DistributionNotFound
 from pip.index import (
diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py
index 2125c622e..ec3059c98 100644
--- a/tests/unit/test_index.py
+++ b/tests/unit/test_index.py
@@ -1,6 +1,7 @@
 import os.path
 
 import pytest
+
 from pip.download import PipSession
 from pip.index import HTMLPage, Link, PackageFinder
 
diff --git a/tests/unit/test_locations.py b/tests/unit/test_locations.py
index 8dce0f60b..8e9e391b5 100644
--- a/tests/unit/test_locations.py
+++ b/tests/unit/test_locations.py
@@ -9,6 +9,7 @@ import sys
 import tempfile
 
 from mock import Mock
+
 from pip.locations import distutils_scheme
 
 if sys.platform == 'win32':
diff --git a/tests/unit/test_options.py b/tests/unit/test_options.py
index c976b830b..759fe77fc 100644
--- a/tests/unit/test_options.py
+++ b/tests/unit/test_options.py
@@ -1,7 +1,8 @@
 import os
 
-import pip.configuration
 import pytest
+
+import pip.configuration
 from pip import cmdoptions, main
 from pip.basecommand import Command
 from pip.commands import commands_dict as commands
diff --git a/tests/unit/test_pep425tags.py b/tests/unit/test_pep425tags.py
index 3fef08087..3bc3068da 100644
--- a/tests/unit/test_pep425tags.py
+++ b/tests/unit/test_pep425tags.py
@@ -1,6 +1,7 @@
 import sys
 
 from mock import patch
+
 from pip import pep425tags
 
 
diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py
index d7bb85429..2a8b555be 100644
--- a/tests/unit/test_req.py
+++ b/tests/unit/test_req.py
@@ -3,12 +3,12 @@ import shutil
 import sys
 import tempfile
 
+import pytest
+from mock import Mock, mock_open, patch
 from pip._vendor import pkg_resources
 from pip._vendor.packaging.markers import Marker
 from pip._vendor.packaging.requirements import Requirement
 
-import pytest
-from mock import Mock, mock_open, patch
 from pip.commands.install import InstallCommand
 from pip.download import PipSession, path_to_url
 from pip.exceptions import (
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index d1e00eea4..c851915dd 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -2,9 +2,11 @@ import os
 import subprocess
 import textwrap
 
-import pip
 import pytest
 from mock import Mock, patch
+from pretend import stub
+
+import pip
 from pip.download import PipSession
 from pip.exceptions import InstallationError, RequirementsFileParseError
 from pip.index import PackageFinder
@@ -13,7 +15,6 @@ from pip.req.req_file import (
     preprocess, process_line, skip_regex
 )
 from pip.req.req_install import InstallRequirement
-from pretend import stub
 from tests.lib import requirements_file
 
 
diff --git a/tests/unit/test_req_install.py b/tests/unit/test_req_install.py
index a24fbf201..b956608cf 100644
--- a/tests/unit/test_req_install.py
+++ b/tests/unit/test_req_install.py
@@ -2,6 +2,7 @@ import os
 import tempfile
 
 import pytest
+
 from pip.req.req_install import InstallRequirement
 
 
diff --git a/tests/unit/test_req_uninstall.py b/tests/unit/test_req_uninstall.py
index 67ce6634d..7097ded9d 100644
--- a/tests/unit/test_req_uninstall.py
+++ b/tests/unit/test_req_uninstall.py
@@ -1,8 +1,9 @@
 import os
 
-import pip.req.req_uninstall
 import pytest
 from mock import Mock
+
+import pip.req.req_uninstall
 from pip.req.req_uninstall import UninstallPathSet, uninstallation_paths
 
 
diff --git a/tests/unit/test_unit_outdated.py b/tests/unit/test_unit_outdated.py
index 3108cf6b2..1276952db 100644
--- a/tests/unit/test_unit_outdated.py
+++ b/tests/unit/test_unit_outdated.py
@@ -3,11 +3,11 @@ import os
 import sys
 from contextlib import contextmanager
 
-from pip._vendor import lockfile
-
 import freezegun
 import pretend
 import pytest
+from pip._vendor import lockfile
+
 from pip.index import InstallationCandidate
 from pip.utils import outdated
 
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index b07ae72d4..e2f446c38 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -12,10 +12,10 @@ import tempfile
 import time
 import warnings
 
-from pip._vendor.six import BytesIO
-
 import pytest
 from mock import Mock, patch
+from pip._vendor.six import BytesIO
+
 from pip.exceptions import (
     HashMismatch, HashMissing, InstallationError, UnsupportedPythonVersion
 )
@@ -23,11 +23,11 @@ from pip.utils import (
     egg_link_path, ensure_dir, get_installed_distributions, normalize_path,
     rmtree, untar_file, unzip_file
 )
-from pip.utils.temp_dir import TempDirectory
 from pip.utils.encoding import auto_decode
 from pip.utils.glibc import check_glibc_version
 from pip.utils.hashes import Hashes, MissingHashes
 from pip.utils.packaging import check_dist_requires_python
+from pip.utils.temp_dir import TempDirectory
 
 
 class Tests_EgglinkPath:
diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py
index 13e5e876c..d119d2903 100644
--- a/tests/unit/test_vcs.py
+++ b/tests/unit/test_vcs.py
@@ -1,7 +1,7 @@
-from pip._vendor.packaging.version import parse as parse_version
-
 import pytest
 from mock import Mock
+from pip._vendor.packaging.version import parse as parse_version
+
 from pip.vcs import VersionControl
 from pip.vcs.bazaar import Bazaar
 from pip.vcs.git import Git
diff --git a/tests/unit/test_wheel.py b/tests/unit/test_wheel.py
index 46182f1ef..e3656b8b8 100644
--- a/tests/unit/test_wheel.py
+++ b/tests/unit/test_wheel.py
@@ -1,10 +1,10 @@
 """Tests for wheel binary packages and .dist-info."""
 import os
 
-from pip._vendor.packaging.requirements import Requirement
-
 import pytest
 from mock import Mock, patch
+from pip._vendor.packaging.requirements import Requirement
+
 from pip import pep425tags, wheel
 from pip.compat import WINDOWS, expanduser
 from pip.exceptions import InvalidWheelFilename, UnsupportedWheel