mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #9729: Fix the signature of SSLSocket.recvfrom() and

Browse source 
SSLSocket.sendto() to match the corresponding socket methods.  Also,
fix various SSLSocket methods to raise socket.error rather than an
unhelpful TypeError when called on an unconnected socket.  Original patch
by Andrew Bennetts.

NOTE: obviously, these methods are untested and unused in the real world...
This commit is contained in:
Antoine Pitrou 2010-09-14 14:37:18 +00:00
parent 7a84877de1
commit f7f390a251
3 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/ssl.py
View file

@ -184,14 +184,16 @@ class SSLSocket(socket):
else:
return v
else:
return socket.send(self, data, flags)
return self._sock.send(data, flags)
def sendto(self, data, addr, flags=0):
def sendto(self, data, flags_or_addr, addr=None):
if self._sslobj:
raise ValueError("sendto not allowed on instances of %s" %
self.__class__)
elif addr is None:
return self._sock.sendto(data, flags_or_addr)
else:
return socket.sendto(self, data, addr, flags)
return self._sock.sendto(data, flags_or_addr, addr)
def sendall(self, data, flags=0):
if self._sslobj:
@ -216,7 +218,7 @@ class SSLSocket(socket):
self.__class__)
return self.read(buflen)
else:
return socket.recv(self, buflen, flags)
return self._sock.recv(buflen, flags)
def recv_into(self, buffer, nbytes=None, flags=0):
if buffer and (nbytes is None):
@ -233,21 +235,21 @@ class SSLSocket(socket):
buffer[:v] = tmp_buffer
return v
else:
return socket.recv_into(self, buffer, nbytes, flags)
return self._sock.recv_into(buffer, nbytes, flags)
def recvfrom(self, addr, buflen=1024, flags=0):
def recvfrom(self, buflen=1024, flags=0):
if self._sslobj:
raise ValueError("recvfrom not allowed on instances of %s" %
self.__class__)
else:
return socket.recvfrom(self, addr, buflen, flags)
return self._sock.recvfrom(buflen, flags)
def recvfrom_into(self, buffer, nbytes=None, flags=0):
if self._sslobj:
raise ValueError("recvfrom_into not allowed on instances of %s" %
self.__class__)
else:
return socket.recvfrom_into(self, buffer, nbytes, flags)
return self._sock.recvfrom_into(buffer, nbytes, flags)
def pending(self):
if self._sslobj: