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

antoine.pitrou python-checkins at python.org
Thu Apr 29 00:58:16 CEST 2010


Author: antoine.pitrou
Date: Thu Apr 29 00:58:16 2010
New Revision: 80604

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

........
  r80603 | antoine.pitrou | 2010-04-29 00:57:15 +0200 (jeu., 29 avril 2010) | 3 lines
  
  Fix test failure with -bb
........


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	Thu Apr 29 00:58:16 2010
@@ -342,14 +342,14 @@
                             self.close()
                             return
                         elif (self.server.starttls_server and
-                              stripped == 'STARTTLS'):
+                              stripped == b'STARTTLS'):
                             if support.verbose and self.server.connectionchatty:
                                 sys.stdout.write(" server: read STARTTLS from client, sending OK...\n")
                             self.write(b"OK\n")
                             if not self.wrap_conn():
                                 return
                         elif (self.server.starttls_server and self.sslconn
-                              and stripped == 'ENDTLS'):
+                              and stripped == b'ENDTLS'):
                             if support.verbose and self.server.connectionchatty:
                                 sys.stdout.write(" server: read ENDTLS from client, sending OK...\n")
                             self.write(b"OK\n")


More information about the Python-checkins mailing list