From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 2 Nov 2014 16:23:14 +0000 (+0100)
Subject: Fix test_urllib without the ssl module
X-Git-Tag: v3.5.0a1~533^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07df6555c43d54d1708eeee5e27828151e977627;p=python

Fix test_urllib without the ssl module
---

diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 962ef73a37..fcd20738f8 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -10,7 +10,10 @@ import unittest
 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 @@ Content-Type: text/html; charset=iso-8859-1
         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):