diff options
author | Ned Deily <nad@acm.org> | 2014-03-26 23:33:28 -0700 |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2014-03-26 23:33:28 -0700 |
commit | c74e48566fd83fe85ba1a642f89c5485cb65843c (patch) | |
tree | 993f537b846c0f81b26d4c33ec1012a46cc939e0 /Lib/test/test_urllib2.py | |
parent | 8f2420c94b350cf37b0ac06bda5539f754c1b469 (diff) | |
parent | 5a507f0f05d6204559af7c54aabe3bd3a6953dfd (diff) | |
download | cpython-git-c74e48566fd83fe85ba1a642f89c5485cb65843c.tar.gz |
Issue #20939: merge from 3.4
Diffstat (limited to 'Lib/test/test_urllib2.py')
-rw-r--r-- | Lib/test/test_urllib2.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 0316c3f463..6272105e2a 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -6,10 +6,6 @@ import io import socket import array import sys -try: - import ssl -except ImportError: - ssl = None import urllib.request # The proxy bypass method imported below has logic specific to the OSX @@ -1442,11 +1438,9 @@ class MiscTests(unittest.TestCase): @unittest.skipUnless(support.is_resource_enabled('network'), 'test requires network access') - @unittest.skipIf(ssl is None, - 'test requires the ssl module') def test_issue16464(self): opener = urllib.request.build_opener() - request = urllib.request.Request("http://www.python.org/~jeremy/") + request = urllib.request.Request("http://www.example.com/") self.assertEqual(None, request.data) opener.open(request, "1".encode("us-ascii")) |