fix bad method names in ssl module (and typo in ssl doc)

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 33904b56ab66a4bf89df268ca1f14f212f915352..658d972e8e5608f371731b2e9731067e28179bf1 100644 (file)
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -129,7 +129,7 @@ Functions, Constants, and Exceptions
    method should signal unexpected EOF from the other end of the connection.  If specified
    as :const:`True` (the default), it returns a normal EOF in response to unexpected
    EOF errors raised from the underlying socket; if :const:`False`, it will raise
-   the exceptions back the caller.
+   the exceptions back to the caller.
 
 .. function:: RAND_status()
 

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 968f9a0075e456ab6e10f0eb61dccd453a7ce903..c072cd960bf442e4220f9fbf55ee37f75daf57b7 100644 (file)
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -215,13 +215,13 @@ class SSLSocket(socket):
         else:
             return socket.send(self, data, flags)
 
-    def send_to(self, data, addr, flags=0):
+    def sendto(self, data, addr, flags=0):
         self._checkClosed()
         if self._sslobj:
-            raise ValueError("send_to not allowed on instances of %s" %
+            raise ValueError("sendto not allowed on instances of %s" %
                              self.__class__)
         else:
-            return socket.send_to(self, data, addr, flags)
+            return socket.sendto(self, data, addr, flags)
 
     def sendall(self, data, flags=0):
         self._checkClosed()
@@ -276,13 +276,13 @@ class SSLSocket(socket):
         else:
             return socket.recv_into(self, buffer, nbytes, flags)
 
-    def recv_from(self, addr, buflen=1024, flags=0):
+    def recvfrom(self, addr, buflen=1024, flags=0):
         self._checkClosed()
         if self._sslobj:
-            raise ValueError("recv_from not allowed on instances of %s" %
+            raise ValueError("recvfrom not allowed on instances of %s" %
                              self.__class__)
         else:
-            return socket.recv_from(self, addr, buflen, flags)
+            return socket.recvfrom(self, addr, buflen, flags)
 
     def pending(self):
         self._checkClosed()