traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow ensurepip even when ssl is unavailable

This commit is contained in:
Donald Stufft 2016-11-02 20:32:37 -04:00
parent f81d60ba68
commit c96b8fcf25
3 changed files with 0 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/ensurepip/__init__.py
View File

@ -12,19 +12,6 @@ _SETUPTOOLS_VERSION = "28.7.1"
_PIP_VERSION = "9.0.0" _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 = [ _PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION), ("setuptools", _SETUPTOOLS_VERSION),
("pip", _PIP_VERSION), ("pip", _PIP_VERSION),
@ -71,7 +58,6 @@ def bootstrap(*, root=None, upgrade=False, user=False,
if altinstall and default_pip: if altinstall and default_pip:
raise ValueError("Cannot use altinstall and default_pip together") raise ValueError("Cannot use altinstall and default_pip together")
_require_ssl_for_pip()
_disable_pip_configuration_settings() _disable_pip_configuration_settings()
# By default, installing pip and setuptools installs all of the # 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) print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr)
return return
_require_ssl_for_pip()
_disable_pip_configuration_settings() _disable_pip_configuration_settings()
# Construct the arguments to be passed to the pip command # Construct the arguments to be passed to the pip command
@ -145,11 +130,6 @@ def _uninstall_helper(*, verbosity=0):
def _main(argv=None): def _main(argv=None):
if ssl is None:
print("Ignoring ensurepip failure: {}".format(_MISSING_SSL_MESSAGE),
file=sys.stderr)
return
import argparse import argparse
parser = argparse.ArgumentParser(prog="python -m ensurepip") parser = argparse.ArgumentParser(prog="python -m ensurepip")
parser.add_argument( parser.add_argument(

65
Lib/test/test_ensurepip.py
View File

@ -9,19 +9,6 @@ import sys
import ensurepip import ensurepip
import ensurepip._uninstall import ensurepip._uninstall
# pip currently requires ssl support, so we ensure we handle
# it being missing (http://bugs.python.org/issue19744)
ensurepip_no_ssl = test.support.import_fresh_module("ensurepip",
blocked=["ssl"])
try:
import ssl
except ImportError:
def requires_usable_pip(f):
deco = unittest.skip(ensurepip._MISSING_SSL_MESSAGE)
return deco(f)
else:
def requires_usable_pip(f):
return f
class TestEnsurePipVersion(unittest.TestCase): class TestEnsurePipVersion(unittest.TestCase):
@ -47,7 +34,6 @@ class EnsurepipMixin:
class TestBootstrap(EnsurepipMixin, unittest.TestCase): class TestBootstrap(EnsurepipMixin, unittest.TestCase):
@requires_usable_pip
def test_basic_bootstrapping(self): def test_basic_bootstrapping(self):
ensurepip.bootstrap() ensurepip.bootstrap()
@ -62,7 +48,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
additional_paths = self.run_pip.call_args[0][1] additional_paths = self.run_pip.call_args[0][1]
self.assertEqual(len(additional_paths), 2) self.assertEqual(len(additional_paths), 2)
@requires_usable_pip
def test_bootstrapping_with_root(self): def test_bootstrapping_with_root(self):
ensurepip.bootstrap(root="/foo/bar/") ensurepip.bootstrap(root="/foo/bar/")
@ -75,7 +60,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
unittest.mock.ANY, unittest.mock.ANY,
) )
@requires_usable_pip
def test_bootstrapping_with_user(self): def test_bootstrapping_with_user(self):
ensurepip.bootstrap(user=True) ensurepip.bootstrap(user=True)
@ -87,7 +71,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
unittest.mock.ANY, unittest.mock.ANY,
) )
@requires_usable_pip
def test_bootstrapping_with_upgrade(self): def test_bootstrapping_with_upgrade(self):
ensurepip.bootstrap(upgrade=True) ensurepip.bootstrap(upgrade=True)
@ -99,7 +82,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
unittest.mock.ANY, unittest.mock.ANY,
) )
@requires_usable_pip
def test_bootstrapping_with_verbosity_1(self): def test_bootstrapping_with_verbosity_1(self):
ensurepip.bootstrap(verbosity=1) ensurepip.bootstrap(verbosity=1)
@ -111,7 +93,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
unittest.mock.ANY, unittest.mock.ANY,
) )
@requires_usable_pip
def test_bootstrapping_with_verbosity_2(self): def test_bootstrapping_with_verbosity_2(self):
ensurepip.bootstrap(verbosity=2) ensurepip.bootstrap(verbosity=2)
@ -123,7 +104,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
unittest.mock.ANY, unittest.mock.ANY,
) )
@requires_usable_pip
def test_bootstrapping_with_verbosity_3(self): def test_bootstrapping_with_verbosity_3(self):
ensurepip.bootstrap(verbosity=3) ensurepip.bootstrap(verbosity=3)
@ -135,17 +115,14 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
unittest.mock.ANY, unittest.mock.ANY,
) )
@requires_usable_pip
def test_bootstrapping_with_regular_install(self): def test_bootstrapping_with_regular_install(self):
ensurepip.bootstrap() ensurepip.bootstrap()
self.assertEqual(self.os_environ["ENSUREPIP_OPTIONS"], "install") self.assertEqual(self.os_environ["ENSUREPIP_OPTIONS"], "install")
@requires_usable_pip
def test_bootstrapping_with_alt_install(self): def test_bootstrapping_with_alt_install(self):
ensurepip.bootstrap(altinstall=True) ensurepip.bootstrap(altinstall=True)
self.assertEqual(self.os_environ["ENSUREPIP_OPTIONS"], "altinstall") self.assertEqual(self.os_environ["ENSUREPIP_OPTIONS"], "altinstall")
@requires_usable_pip
def test_bootstrapping_with_default_pip(self): def test_bootstrapping_with_default_pip(self):
ensurepip.bootstrap(default_pip=True) ensurepip.bootstrap(default_pip=True)
self.assertNotIn("ENSUREPIP_OPTIONS", self.os_environ) self.assertNotIn("ENSUREPIP_OPTIONS", self.os_environ)
@ -155,7 +132,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
ensurepip.bootstrap(altinstall=True, default_pip=True) ensurepip.bootstrap(altinstall=True, default_pip=True)
self.assertFalse(self.run_pip.called) self.assertFalse(self.run_pip.called)
@requires_usable_pip
def test_pip_environment_variables_removed(self): def test_pip_environment_variables_removed(self):
# ensurepip deliberately ignores all pip environment variables # ensurepip deliberately ignores all pip environment variables
# See http://bugs.python.org/issue19734 for details # See http://bugs.python.org/issue19734 for details
@ -163,7 +139,6 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
ensurepip.bootstrap() ensurepip.bootstrap()
self.assertNotIn("PIP_THIS_SHOULD_GO_AWAY", self.os_environ) self.assertNotIn("PIP_THIS_SHOULD_GO_AWAY", self.os_environ)
@requires_usable_pip
def test_pip_config_file_disabled(self): def test_pip_config_file_disabled(self):
# ensurepip deliberately ignores the pip config file # ensurepip deliberately ignores the pip config file
# See http://bugs.python.org/issue20053 for details # See http://bugs.python.org/issue20053 for details
@ -205,7 +180,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
self.assertFalse(self.run_pip.called) self.assertFalse(self.run_pip.called)
@requires_usable_pip
def test_uninstall(self): def test_uninstall(self):
with fake_pip(): with fake_pip():
ensurepip._uninstall_helper() ensurepip._uninstall_helper()
@ -217,7 +191,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
] ]
) )
@requires_usable_pip
def test_uninstall_with_verbosity_1(self): def test_uninstall_with_verbosity_1(self):
with fake_pip(): with fake_pip():
ensurepip._uninstall_helper(verbosity=1) ensurepip._uninstall_helper(verbosity=1)
@ -229,7 +202,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
] ]
) )
@requires_usable_pip
def test_uninstall_with_verbosity_2(self): def test_uninstall_with_verbosity_2(self):
with fake_pip(): with fake_pip():
ensurepip._uninstall_helper(verbosity=2) ensurepip._uninstall_helper(verbosity=2)
@ -241,7 +213,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
] ]
) )
@requires_usable_pip
def test_uninstall_with_verbosity_3(self): def test_uninstall_with_verbosity_3(self):
with fake_pip(): with fake_pip():
ensurepip._uninstall_helper(verbosity=3) ensurepip._uninstall_helper(verbosity=3)
@ -253,7 +224,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
] ]
) )
@requires_usable_pip
def test_pip_environment_variables_removed(self): def test_pip_environment_variables_removed(self):
# ensurepip deliberately ignores all pip environment variables # ensurepip deliberately ignores all pip environment variables
# See http://bugs.python.org/issue19734 for details # See http://bugs.python.org/issue19734 for details
@ -262,7 +232,6 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
ensurepip._uninstall_helper() ensurepip._uninstall_helper()
self.assertNotIn("PIP_THIS_SHOULD_GO_AWAY", self.os_environ) self.assertNotIn("PIP_THIS_SHOULD_GO_AWAY", self.os_environ)
@requires_usable_pip
def test_pip_config_file_disabled(self): def test_pip_config_file_disabled(self):
# ensurepip deliberately ignores the pip config file # ensurepip deliberately ignores the pip config file
# See http://bugs.python.org/issue20053 for details # See http://bugs.python.org/issue20053 for details
@ -271,44 +240,12 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
self.assertEqual(self.os_environ["PIP_CONFIG_FILE"], os.devnull) self.assertEqual(self.os_environ["PIP_CONFIG_FILE"], os.devnull)
class TestMissingSSL(EnsurepipMixin, unittest.TestCase):
def setUp(self):
sys.modules["ensurepip"] = ensurepip_no_ssl
@self.addCleanup
def restore_module():
sys.modules["ensurepip"] = ensurepip
super().setUp()
def test_bootstrap_requires_ssl(self):
self.os_environ["PIP_THIS_SHOULD_STAY"] = "test fodder"
with self.assertRaisesRegex(RuntimeError, "requires SSL/TLS"):
ensurepip_no_ssl.bootstrap()
self.assertFalse(self.run_pip.called)
self.assertIn("PIP_THIS_SHOULD_STAY", self.os_environ)
def test_uninstall_requires_ssl(self):
self.os_environ["PIP_THIS_SHOULD_STAY"] = "test fodder"
with self.assertRaisesRegex(RuntimeError, "requires SSL/TLS"):
with fake_pip():
ensurepip_no_ssl._uninstall_helper()
self.assertFalse(self.run_pip.called)
self.assertIn("PIP_THIS_SHOULD_STAY", self.os_environ)
def test_main_exits_early_with_warning(self):
with test.support.captured_stderr() as stderr:
ensurepip_no_ssl._main(["--version"])
warning = stderr.getvalue().strip()
self.assertTrue(warning.endswith("requires SSL/TLS"), warning)
self.assertFalse(self.run_pip.called)
# Basic testing of the main functions and their argument parsing # Basic testing of the main functions and their argument parsing
EXPECTED_VERSION_OUTPUT = "pip " + ensurepip._PIP_VERSION EXPECTED_VERSION_OUTPUT = "pip " + ensurepip._PIP_VERSION
class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase): class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase):
@requires_usable_pip
def test_bootstrap_version(self): def test_bootstrap_version(self):
with test.support.captured_stdout() as stdout: with test.support.captured_stdout() as stdout:
with self.assertRaises(SystemExit): with self.assertRaises(SystemExit):
@ -317,7 +254,6 @@ class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase):
self.assertEqual(result, EXPECTED_VERSION_OUTPUT) self.assertEqual(result, EXPECTED_VERSION_OUTPUT)
self.assertFalse(self.run_pip.called) self.assertFalse(self.run_pip.called)
@requires_usable_pip
def test_basic_bootstrapping(self): def test_basic_bootstrapping(self):
ensurepip._main([]) ensurepip._main([])
@ -342,7 +278,6 @@ class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase):
self.assertEqual(result, EXPECTED_VERSION_OUTPUT) self.assertEqual(result, EXPECTED_VERSION_OUTPUT)
self.assertFalse(self.run_pip.called) self.assertFalse(self.run_pip.called)
@requires_usable_pip
def test_basic_uninstall(self): def test_basic_uninstall(self):
with fake_pip(): with fake_pip():
ensurepip._uninstall._main([]) ensurepip._uninstall._main([])

8
Lib/test/test_venv.py
View File

@ -18,12 +18,6 @@ from test.support import (captured_stdout, captured_stderr,
import unittest import unittest
import venv import venv
# pip currently requires ssl support, so we ensure we handle
# it being missing (http://bugs.python.org/issue19744)
try:
import ssl
except ImportError:
ssl = None
try: try:
import threading import threading
@ -337,8 +331,6 @@ class EnsurePipTest(BaseTest):
self.assertTrue(os.path.exists(os.devnull)) self.assertTrue(os.path.exists(os.devnull))
# Requesting pip fails without SSL (http://bugs.python.org/issue19744)
@unittest.skipIf(ssl is None, ensurepip._MISSING_SSL_MESSAGE)
@unittest.skipUnless(threading, 'some dependencies of pip import threading' @unittest.skipUnless(threading, 'some dependencies of pip import threading'
' module unconditionally') ' module unconditionally')
# Issue #26610: pip/pep425tags.py requires ctypes # Issue #26610: pip/pep425tags.py requires ctypes