commit 2c6799ab8c3b53b8e019415d4b61834f6dbdb320
author Antoine Pitrou <solipsis@pitrou.net> Wed Mar 24 22:12:15 2010 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Wed Mar 24 22:12:15 2010 +0000
tree 0d268d2d6b1fb63a103dbf0e45757c16fe01a4cb
parent fb224e303435c9b98fd1a24dbd3cf119d7b90b6b

Revert r79384 (the fix failed).

Lib/test/test_ftplib.py

diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 4b73e00..182d5a7 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -315,21 +315,12 @@
             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):