Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Revert r79384 (the fix failed).

This commit is contained in:
Antoine Pitrou 2010-03-24 22:12:15 +00:00
parent fb224e3034
commit 2c6799ab8c
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/test/test_ftplib.py
View File

@ -315,21 +315,12 @@ if ssl is not None:
raise raise
def close(self): def close(self):
ssl_want_read_or_write = False
try: try:
if isinstance(self.socket, ssl.SSLSocket): if isinstance(self.socket, ssl.SSLSocket):
if self.socket._sslobj is not None: if self.socket._sslobj is not None:
try: self.socket.unwrap()
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
finally: finally:
if not ssl_want_read_or_write: super(SSLConnection, self).close()
super(SSLConnection, self).close()
class DummyTLS_DTPHandler(SSLConnection, DummyDTPHandler): class DummyTLS_DTPHandler(SSLConnection, DummyDTPHandler):