Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge heads

This commit is contained in:
Antoine Pitrou 2014-11-02 18:42:41 +01:00
parent 8a03896cac 07df6555c4
commit a14414dfe9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_urllib.py
View File

@ -10,7 +10,10 @@ import unittest
from unittest.mock import patch from unittest.mock import patch
from test import support from test import support
import os import os
import ssl try:
import ssl
except ImportError:
ssl = None
import sys import sys
import tempfile import tempfile
from nturl2path import url2pathname, pathname2url from nturl2path import url2pathname, pathname2url
@ -380,6 +383,7 @@ Content-Type: text/html; charset=iso-8859-1
with support.check_warnings(('',DeprecationWarning)): with support.check_warnings(('',DeprecationWarning)):
urllib.request.URLopener() urllib.request.URLopener()
@unittest.skipUnless(ssl, "ssl module required")
def test_cafile_and_context(self): def test_cafile_and_context(self):
context = ssl.create_default_context() context = ssl.create_default_context()
with self.assertRaises(ValueError): with self.assertRaises(ValueError):