diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-03-19 16:34:12 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-03-19 16:34:12 (GMT) |
| commit | 9fb288f9bdb68bd7814e7cdc45865bd25415665e (patch) | |
| tree | 3fe4c9884ff8ec9ab12a29bd04f6ed0839b56b1b | |
| parent | 38d872ee5df1dd89c1ce1e04e7e24ef651d63bc7 (diff) | |
| parent | 9a90243f8b5a2b8d92cedb1e8745b8758fe08ebf (diff) | |
| download | cpython-9fb288f9bdb68bd7814e7cdc45865bd25415665e.zip cpython-9fb288f9bdb68bd7814e7cdc45865bd25415665e.tar.gz cpython-9fb288f9bdb68bd7814e7cdc45865bd25415665e.tar.bz2 | |
(Merge 3.4) Skip test_urllib2.test_issue16464() is the ssl module is missing
| -rw-r--r-- | Lib/test/test_urllib2.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 4b92d63..0316c3f 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -6,6 +6,10 @@ 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 @@ -1438,6 +1442,8 @@ 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/") |