From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 19 Nov 2010 20:10:53 +0000 (+0000)
Subject: Merged revisions 86533 via svnmerge from
X-Git-Tag: v3.1.3~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9a9417f487beeddbf0af4e253fab3c1545207f4;p=thirdparty%2FPython%2Fcpython.git

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 7236947f580b..c8649407d7d9 100644
--- 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: