From 2c6799ab8c3b53b8e019415d4b61834f6dbdb320 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 24 Mar 2010 22:12:15 +0000 Subject: [PATCH] Revert r79384 (the fix failed). --- Lib/test/test_ftplib.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index 4b73e0082a9..182d5a7c743 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -315,21 +315,12 @@ if ssl is not None: raise def close(self): - ssl_want_read_or_write = False try: if isinstance(self.socket, ssl.SSLSocket): if self.socket._sslobj is not None: - try: - self.socket.unwrap() - except ssl.SSLError, err: - if err.args[0] in (ssl.SSL_ERROR_WANT_READ, - ssl.SSL_ERROR_WANT_WRITE): - ssl_want_read_or_write = True - else: - raise + self.socket.unwrap() finally: - if not ssl_want_read_or_write: - super(SSLConnection, self).close() + super(SSLConnection, self).close() class DummyTLS_DTPHandler(SSLConnection, DummyDTPHandler):