changeset:   89712:cd39d4cab680
branch:      3.4
user:        Nick Coghlan <ncoghlan@gmail.com>
date:        Sat Feb 15 09:14:54 2014 +1000
files:       Lib/ensurepip/__init__.py Lib/test/test_ensurepip.py Misc/NEWS
description:
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


diff -r 3c01209ab697 -r cd39d4cab680 Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py	Thu Feb 13 19:22:14 2014 -0500
+++ b/Lib/ensurepip/__init__.py	Sat Feb 15 09:14:54 2014 +1000
@@ -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 -r 3c01209ab697 -r cd39d4cab680 Lib/test/test_ensurepip.py
--- a/Lib/test/test_ensurepip.py	Thu Feb 13 19:22:14 2014 -0500
+++ b/Lib/test/test_ensurepip.py	Sat Feb 15 09:14:54 2014 +1000
@@ -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 -r 3c01209ab697 -r cd39d4cab680 Misc/NEWS
--- a/Misc/NEWS	Thu Feb 13 19:22:14 2014 -0500
+++ b/Misc/NEWS	Sat Feb 15 09:14:54 2014 +1000
@@ -20,6 +20,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 #20594: Avoid name clash with the libc function posix_close.