summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-03-27 06:26:03 (GMT)
committerNed Deily <nad@acm.org>2014-03-27 06:26:03 (GMT)
commite74153a436a844f4606cba80ee6f9e41bd532df4 (patch)
treecf4409decfbba1780985128a0ae7fb0b6e0de161 /Lib
parentef1c26798ca95d10d29979c6fef77ac3b6f27c26 (diff)
downloadcpython-e74153a436a844f4606cba80ee6f9e41bd532df4.zip
cpython-e74153a436a844f4606cba80ee6f9e41bd532df4.tar.gz
cpython-e74153a436a844f4606cba80ee6f9e41bd532df4.tar.bz2
Issue #20939: Backout test_urllib2.test_issue16464 disables:
68335b8afb1f 3.4 ad0c75b7bd7d default
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_urllib2.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 0316c3f..4b92d63 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,8 +1438,6 @@ 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/")