From: Antoine Pitrou Date: Wed, 28 Apr 2010 22:58:16 +0000 (+0000) Subject: Merged revisions 80603 via svnmerge from X-Git-Tag: v3.1.3rc1~843 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b199796f97565c6bc495b59076302e212cff0785;p=python 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 982fa24eba..d76472a0fe 100644 --- 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")