Merged revisions 86533 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86533 | antoine.pitrou | 2010-11-19 21:07:52 +0100 (ven., 19 nov. 2010) | 3 lines

  Fix test_ssl_presence when ssl is not present
........

diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 7236947f580b00feb4d53e801de66295bf4a4391..c8649407d7d962f5b103e1224869057b9b499fd3 100644 (file)
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -146,8 +146,8 @@ class XMLRPCTestCase(unittest.TestCase):
     def test_ssl_presence(self):
         try:
             import ssl
-        except:
-            have_ssl = False
+        except ImportError:
+            has_ssl = False
         else:
             has_ssl = True
         try: