[Python-3000-checkins] r64587 - in python/branches/py3k: Doc/library/ssl.rst Lib/ssl.py

[bill.janssen]

Author: bill.janssen
Date: Sun Jun 29 02:05:51 2008
New Revision: 64587

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

Modified:
   python/branches/py3k/Doc/library/ssl.rst
   python/branches/py3k/Lib/ssl.py

Modified: python/branches/py3k/Doc/library/ssl.rst
==============================================================================
--- python/branches/py3k/Doc/library/ssl.rst	(original)
+++ python/branches/py3k/Doc/library/ssl.rst	Sun Jun 29 02:05:51 2008
@@ -129,7 +129,7 @@
    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()
 

Modified: python/branches/py3k/Lib/ssl.py
==============================================================================
--- python/branches/py3k/Lib/ssl.py	(original)
+++ python/branches/py3k/Lib/ssl.py	Sun Jun 29 02:05:51 2008
@@ -215,13 +215,13 @@
         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 @@
         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()