[Python-checkins] cpython (merge 3.4 -> default): (Merge 3.4) Skip test_urllib2.test_issue16464() is the ssl module is missing
victor.stinner
python-checkins at python.org
Wed Mar 19 17:34:24 CET 2014
http://hg.python.org/cpython/rev/ad0c75b7bd7d
changeset: 89857:ad0c75b7bd7d
parent: 89855:9120196b3114
parent: 89856:68335b8afb1f
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Mar 19 17:34:12 2014 +0100
summary:
(Merge 3.4) Skip test_urllib2.test_issue16464() is the ssl module is missing
files:
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
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -6,6 +6,10 @@
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 @@
@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/")
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list