From b6abba03117d9d00740a275bc1918ad37156eeab Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 20 Sep 2016 14:17:06 +0300 Subject: [PATCH] Don't use the vendored concurrent.futures when it's available in stdlib. --- pip/req/req_set.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pip/req/req_set.py b/pip/req/req_set.py index d45f29cb377..c509f0b3427 100644 --- a/pip/req/req_set.py +++ b/pip/req/req_set.py @@ -6,7 +6,10 @@ from pip._vendor import pkg_resources from pip._vendor import requests -from pip._vendor.concurrent.futures.thread import ThreadPoolExecutor +try: + from concurrent.futures.thread import ThreadPoolExecutor +except ImportError: + from pip._vendor.concurrent.futures.thread import ThreadPoolExecutor from pip.compat import expanduser from pip.download import (is_file_url, is_dir_url, is_vcs_url, url_to_path, unpack_url)