diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-02-02 01:18:29 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-02-02 01:18:29 (GMT) |
| commit | ad9f99e41fb7d7e51c8424bb3adba6ad555d0451 (patch) | |
| tree | 1194b2e060bb6d19f42f53a7bac873e02db126c9 /Lib | |
| parent | 83e814d8526b74a80fdf7a4c901f689d15cb1f5d (diff) | |
| parent | d40f136d35cbe2ac4dd5b3bc8e3474343865b8dd (diff) | |
| download | cpython-ad9f99e41fb7d7e51c8424bb3adba6ad555d0451.zip cpython-ad9f99e41fb7d7e51c8424bb3adba6ad555d0451.tar.gz cpython-ad9f99e41fb7d7e51c8424bb3adba6ad555d0451.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/site.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_site.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/site.py b/Lib/site.py index 14f4f80..4959cfc 100644 --- a/Lib/site.py +++ b/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) diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 79af49c..e234164 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -410,6 +410,7 @@ class ImportSideEffectTests(unittest.TestCase): 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"), |