[Python-checkins] r80536 - in python/branches/py3k: Lib/test/test_ssl.py

antoine.pitrou python-checkins at python.org
Tue Apr 27 15:15:18 CEST 2010


Author: antoine.pitrou
Date: Tue Apr 27 15:15:18 2010
New Revision: 80536

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

Modified: python/branches/py3k/Lib/test/test_ssl.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ssl.py	(original)
+++ python/branches/py3k/Lib/test/test_ssl.py	Tue Apr 27 15:15:18 2010
@@ -679,6 +679,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:


More information about the Python-checkins mailing list