[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/3231a13a0c82
changeset:   94447:3231a13a0c82
parent:      94443:cf4f7a572b79
parent:      94445:fb65ac5aaaac
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Feb 01 20:18:29 2015 -0500
summary:
  merge 3.4

files:
  Lib/site.py           |  2 +-
  Lib/test/test_site.py |  1 +
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -366,7 +366,7 @@
         dirs.extend([os.path.join(here, os.pardir), here, os.curdir])
     builtins.license = _sitebuiltins._Printer(
         "license",
-        "See http://www.python.org/psf/license/",
+        "See https://www.python.org/psf/license/",
         files, dirs)
 
 
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -410,6 +410,7 @@
                 self.fail("sitecustomize not imported automatically")
 
     @test.support.requires_resource('network')
+    @test.support.system_must_validate_cert
     @unittest.skipUnless(sys.version_info[3] == 'final',
                          'only for released versions')
     @unittest.skipUnless(hasattr(urllib.request, "HTTPSHandler"),

-- 
Repository URL: https://hg.python.org/cpython