mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge 3.4

Browse source
This commit is contained in:
Benjamin Peterson 2015-02-01 20:18:29 -05:00
commit ad9f99e41f
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/site.py
View file

@ -366,7 +366,7 @@ def setcopyright():
dirs.extend([os.path.join(here, os.pardir), here, os.curdir]) dirs.extend([os.path.join(here, os.pardir), here, os.curdir])
builtins.license = _sitebuiltins._Printer( builtins.license = _sitebuiltins._Printer(
"license", "license",
"See http://www.python.org/psf/license/", "See https://www.python.org/psf/license/",
files, dirs) files, dirs)

1
Lib/test/test_site.py
View file

@ -410,6 +410,7 @@ class ImportSideEffectTests(unittest.TestCase):
self.fail("sitecustomize not imported automatically") self.fail("sitecustomize not imported automatically")
@test.support.requires_resource('network') @test.support.requires_resource('network')
@test.support.system_must_validate_cert
@unittest.skipUnless(sys.version_info[3] == 'final', @unittest.skipUnless(sys.version_info[3] == 'final',
'only for released versions') 'only for released versions')
@unittest.skipUnless(hasattr(urllib.request, "HTTPSHandler"), @unittest.skipUnless(hasattr(urllib.request, "HTTPSHandler"),