[Python-checkins] cpython: Issue #19744: Handle missing SSL/TLS in ensurepip

Sat Feb 15 00:17:54 CET 2014

http://hg.python.org/cpython/rev/9f76adbac8b7
changeset: 89192:9f76adbac8b7
parent: 89190:378bdb92e5b7
user: Nick Coghlan <ncoghlan at gmail.com>
date: Sat Feb 15 09:14:54 2014 +1000
summary:
 Issue #19744: Handle missing SSL/TLS in ensurepip
- now also allows POSIX installation with SSL/TLS missing
- a goal for pip 1.6 is to allow local use without SSL/TLS
files:
 Lib/ensurepip/__init__.py | 5 +++++
 Lib/test/test_ensurepip.py | 8 ++++++++
 Misc/NEWS | 4 ++++
 3 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -144,6 +144,11 @@
 
 
 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(
diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
--- a/Lib/test/test_ensurepip.py
+++ b/Lib/test/test_ensurepip.py
@@ -281,12 +281,20 @@
 self.run_pip.assert_not_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.run_pip.assert_not_called()
+
 # Basic testing of the main functions and their argument parsing
 
 EXPECTED_VERSION_OUTPUT = "pip " + ensurepip._PIP_VERSION
 
 class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase):
 
+ @requires_usable_pip
 def test_bootstrap_version(self):
 with test.support.captured_stdout() as stdout:
 with self.assertRaises(SystemExit):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,10 @@
 Library
 -------
 
+- Issue #19744: the ensurepip installation step now just prints a warning to
+ stderr rather than failing outright if SSL/TLS is unavailable. This allows
+ local installation of POSIX builds without SSL/TLS support.
+
 - Issue #6815: os.path.expandvars() now supports non-ASCII environment
 variables names and values.
 
-- 
Repository URL: http://hg.python.org/cpython
