diff Lib/socket.py @ 38580:a114003aa3d3 legacy-trunk

Fixes in struct and socket from merge reviews. - Following Guido's comments, renamed * pack_to -> pack_into * recv_buf -> recv_into * recvfrom_buf -> recvfrom_into - Made fixes to _struct.c according to Neal Norwitz comments on the checkins list. - Converted some ints into the appropriate -- I hope -- ssize_t and size_t.
author Martin Blais <blais@furius.ca>
date Sun, 04 Jun 2006 13:49:49 +0000
parents 36cd4a4ab8f7
children c547f6e91c58
line wrap: on
line diff
--- a/Lib/socket.py	Sun Jun 04 12:59:59 2006 +0000
+++ b/Lib/socket.py	Sun Jun 04 13:49:49 2006 +0000
@@ -141,7 +141,7 @@
     __doc__ = _realsocket.__doc__
 
     __slots__ = ["_sock",
-                 "recv", "recv_buf", "recvfrom_buf",
+                 "recv", "recv_into", "recvfrom_into",
                  "send", "sendto", "recvfrom",
                  "__weakref__"]
 
@@ -151,10 +151,10 @@
         self._sock = _sock
         self.send = self._sock.send
         self.recv = self._sock.recv
-        self.recv_buf = self._sock.recv_buf
+        self.recv_into = self._sock.recv_into
         self.sendto = self._sock.sendto
         self.recvfrom = self._sock.recvfrom
-        self.recvfrom_buf = self._sock.recvfrom_buf
+        self.recvfrom_into = self._sock.recvfrom_into
 
     def close(self):
         self._sock = _closedsocket()