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

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Apr 27 15:14:50 2010
New Revision: 80535

Log:
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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_ssl.py

Modified: python/branches/release26-maint/Lib/test/test_ssl.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_ssl.py	(original)
+++ python/branches/release26-maint/Lib/test/test_ssl.py	Tue Apr 27 15:14:50 2010
@@ -647,6 +647,9 @@
             except ssl.SSLError, x:
                 if test_support.verbose:
                     sys.stdout.write("\nSSLError is %s\n" % x[1])
+            except socket.error, 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:
@@ -858,7 +861,7 @@
                 sys.stdout.write("\n")
             try:
                 tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, True)
-            except (SSLError, socket.error), x:
+            except (ssl.SSLError, socket.error), x:
                 # this fails on some older versions of OpenSSL (0.9.7l, for instance)
                 if test_support.verbose:
                     sys.stdout.write(