merge 3.4

Lib/site.py

@@ -366,7 +366,7 @@ def setcopyright():
         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)
 
 

Lib/test/test_site.py

@@ -410,6 +410,7 @@ def test_sitecustomize_executed(self):
                 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"),