merge 3.4

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

View file

@ -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"),