aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/ssl_support.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-01-23 10:32:22 -0500
committerGitHub <noreply@github.com>2017-01-23 10:32:22 -0500
commit089cdeb489a0fa94d11b7307b54210ef9aa40511 (patch)
treeee738b703f1b0737e139b5d10f62e54bd20e1028 /setuptools/ssl_support.py
parentaaec654d804cb78dbb6391afff721a63f26a71cd (diff)
parent11676d39c405672270a543bdc32de395b935b869 (diff)
downloadexternal_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.gz
external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.bz2
external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.zip
Merge pull request #933 from pypa/feature/581-depend-not-bundle
Bundle dependencies instead of vendoring them
Diffstat (limited to 'setuptools/ssl_support.py')
-rw-r--r--setuptools/ssl_support.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 72b18ef2..fa5e4421 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -4,7 +4,7 @@ import atexit
import re
import functools
-from setuptools.extern.six.moves import urllib, http_client, map, filter
+from six.moves import urllib, http_client, map, filter
from pkg_resources import ResolutionError, ExtractionError