diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-28 22:58:16 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-28 22:58:16 (GMT) |
| commit | b199796f97565c6bc495b59076302e212cff0785 (patch) | |
| tree | 8d2b90fa265f5b4159660f59883c1c587d6d64f5 /Lib | |
| parent | fd3c7bdd5b8be3736fa3aab5a3f48c380e46ad11 (diff) | |
| download | cpython-b199796f97565c6bc495b59076302e212cff0785.zip cpython-b199796f97565c6bc495b59076302e212cff0785.tar.gz cpython-b199796f97565c6bc495b59076302e212cff0785.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_ssl.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 982fa24..d76472a 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") |