[Python-checkins] r86534 - in python/branches/release31-maint: Lib/test/test_xmlrpc.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Fri Nov 19 21:10:53 2010
New Revision: 86534

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_xmlrpc.py

Modified: python/branches/release31-maint/Lib/test/test_xmlrpc.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_xmlrpc.py	(original)
+++ python/branches/release31-maint/Lib/test/test_xmlrpc.py	Fri Nov 19 21:10:53 2010
@@ -146,8 +146,8 @@
     def test_ssl_presence(self):
         try:
             import ssl
-        except:
-            have_ssl = False
+        except ImportError:
+            has_ssl = False
         else:
             has_ssl = True
         try: