cpython (merge default -> default): Merge heads
https://hg.python.org/cpython/rev/7e89c24245ea changeset: 93362:7e89c24245ea parent: 93361:f0b334ae95c9 parent: 93359:016bc54999a2 user: Antoine Pitrou <solipsis@pitrou.net> date: Sun Nov 02 18:42:41 2014 +0100 summary: Merge heads files: Lib/test/test_urllib.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -10,7 +10,10 @@ from unittest.mock import patch from test import support import os -import ssl +try: + import ssl +except ImportError: + ssl = None import sys import tempfile from nturl2path import url2pathname, pathname2url @@ -380,6 +383,7 @@ with support.check_warnings(('',DeprecationWarning)): urllib.request.URLopener() + @unittest.skipUnless(ssl, "ssl module required") def test_cafile_and_context(self): context = ssl.create_default_context() with self.assertRaises(ValueError): -- Repository URL: https://hg.python.org/cpython
participants (1)
-
antoine.pitrou