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

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 982fa24ebabd61551ebdae4cf351b711ad38383a..d76472a0fe884276b3c95f0a1c008774c003e3c1 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -342,14 +342,14 @@ else:
                             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")