summaryrefslogtreecommitdiffstats
path: root/Lib/ensurepip
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2016-11-03 00:32:37 (GMT)
committerDonald Stufft <donald@stufft.io>2016-11-03 00:32:37 (GMT)
commitc96b8fcf251dfd833411188fe564475942269012 (patch)
treea232bfe58a1629ec9c70940b97d6715d0d1b90f9 /Lib/ensurepip
parentf81d60ba68eb40bbae0339d55d5722706c57a6c7 (diff)
downloadcpython-c96b8fcf251dfd833411188fe564475942269012.zip
cpython-c96b8fcf251dfd833411188fe564475942269012.tar.gz
cpython-c96b8fcf251dfd833411188fe564475942269012.tar.bz2
Allow ensurepip even when ssl is unavailable
Diffstat (limited to 'Lib/ensurepip')
-rw-r--r--Lib/ensurepip/__init__.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 68853ef..7fd81c4 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -12,19 +12,6 @@ _SETUPTOOLS_VERSION = "28.7.1"
_PIP_VERSION = "9.0.0"
-# pip currently requires ssl support, so we try to provide a nicer
-# error message when that is missing (http://bugs.python.org/issue19744)
-_MISSING_SSL_MESSAGE = ("pip {} requires SSL/TLS".format(_PIP_VERSION))
-try:
- import ssl
-except ImportError:
- ssl = None
- def _require_ssl_for_pip():
- raise RuntimeError(_MISSING_SSL_MESSAGE)
-else:
- def _require_ssl_for_pip():
- pass
-
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
("pip", _PIP_VERSION),
@@ -71,7 +58,6 @@ def bootstrap(*, root=None, upgrade=False, user=False,
if altinstall and default_pip:
raise ValueError("Cannot use altinstall and default_pip together")
- _require_ssl_for_pip()
_disable_pip_configuration_settings()
# By default, installing pip and setuptools installs all of the
@@ -133,7 +119,6 @@ def _uninstall_helper(*, verbosity=0):
print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr)
return
- _require_ssl_for_pip()
_disable_pip_configuration_settings()
# Construct the arguments to be passed to the pip command
@@ -145,11 +130,6 @@ def _uninstall_helper(*, verbosity=0):
def _main(argv=None):
- if ssl is None:
- print("Ignoring ensurepip failure: {}".format(_MISSING_SSL_MESSAGE),
- file=sys.stderr)
- return
-
import argparse
parser = argparse.ArgumentParser(prog="python -m ensurepip")
parser.add_argument(