Issue #3805: clean up implementation of the _read method in _ssl.c.

This commit is contained in:
Antoine Pitrou 2010-09-03 18:38:17 +00:00
parent aa44b2b5ca
commit 24e561ae04
2 changed files with 33 additions and 32 deletions

View file

@ -199,14 +199,14 @@ class SSLSocket(socket):
self._checkClosed()
try:
if buffer:
v = self._sslobj.read(buffer, len)
if buffer is not None:
v = self._sslobj.read(len, buffer)
else:
v = self._sslobj.read(len or 1024)
return v
except SSLError as x:
if x.args[0] == SSL_ERROR_EOF and self.suppress_ragged_eofs:
if buffer:
if buffer is not None:
return 0
else:
return b''