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

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Apr 27 15:16:06 2010
New Revision: 80537

Log:
Merged revisions 80536 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80536 | antoine.pitrou | 2010-04-27 15:15:18 +0200 (mar., 27 avril 2010) | 9 lines
  
  Merged revisions 80534 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r80534 | antoine.pitrou | 2010-04-27 15:13:26 +0200 (mar., 27 avril 2010) | 3 lines
    
    socket.error can really happen here, and fix a possible NameError
  ........
................


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

Modified: python/branches/release31-maint/Lib/test/test_ssl.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_ssl.py	(original)
+++ python/branches/release31-maint/Lib/test/test_ssl.py	Tue Apr 27 15:16:06 2010
@@ -643,6 +643,9 @@
             except ssl.SSLError as x:
                 if support.verbose:
                     sys.stdout.write("\nSSLError is %s\n" % x.args[1])
+            except socket.error as x:
+                if test_support.verbose:
+                    sys.stdout.write("\nsocket.error is %s\n" % x[1])
             else:
                 self.fail("Use of invalid cert should have failed!")
         finally: