From 10c4c23a252294801e44de6d162e3f486baf1784 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 3 Sep 2010 18:39:47 +0000 Subject: Merged revisions 84464 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84464 | antoine.pitrou | 2010-09-03 20:38:17 +0200 (ven., 03 sept. 2010) | 3 lines Issue #3805: clean up implementation of the _read method in _ssl.c. ........ --- Lib/ssl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Lib/ssl.py') diff --git a/Lib/ssl.py b/Lib/ssl.py index ec6446933aa..0ba34427391 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -162,14 +162,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'' -- cgit v1.2.3