From 52093b8e57a8c4f4be1517208cb370512ff3469d Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 22 Mar 2010 14:41:48 +0000 Subject: Fix an occasional test_ftplib failure, following r79226. --- Lib/test/test_ftplib.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index e8241e8..182d5a7 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -293,7 +293,9 @@ if ssl is not None: try: return super(SSLConnection, self).send(data) except ssl.SSLError, err: - if err.args[0] in (ssl.SSL_ERROR_EOF, ssl.SSL_ERROR_ZERO_RETURN): + if err.args[0] in (ssl.SSL_ERROR_EOF, ssl.SSL_ERROR_ZERO_RETURN, + ssl.SSL_ERROR_WANT_READ, + ssl.SSL_ERROR_WANT_WRITE): return 0 raise @@ -301,6 +303,9 @@ if ssl is not None: try: return super(SSLConnection, self).recv(buffer_size) except ssl.SSLError, err: + if err.args[0] in (ssl.SSL_ERROR_WANT_READ, + ssl.SSL_ERROR_WANT_WRITE): + return '' if err.args[0] in (ssl.SSL_ERROR_EOF, ssl.SSL_ERROR_ZERO_RETURN): self.handle_close() return '' -- cgit v0.12