summaryrefslogtreecommitdiffstats
path: root/Doc/library/socket.rst
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-02-09 09:55:56 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-02-09 09:55:56 (GMT)
commit0bfa963fbb45602923b858d00a44e788a4a42ad5 (patch)
tree9006f66fbabc3c4834e99df8098bf448520978e0 /Doc/library/socket.rst
parent4a2e1a0da7f1f16ee6a9ce75fdd60b4d30cb37d1 (diff)
parent6e13f130a9bde00db9fc17934987ed36da251aa7 (diff)
downloadcpython-0bfa963fbb45602923b858d00a44e788a4a42ad5.zip
cpython-0bfa963fbb45602923b858d00a44e788a4a42ad5.tar.gz
cpython-0bfa963fbb45602923b858d00a44e788a4a42ad5.tar.bz2
merged from 3.2
Issue #6005: Examples in the socket library documentation use sendall, where relevant, instead send method.
Diffstat (limited to 'Doc/library/socket.rst')
-rw-r--r--Doc/library/socket.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 6b7728f..8cc5a7e 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -981,7 +981,8 @@ correspond to Unix system calls applicable to sockets.
optional *flags* argument has the same meaning as for :meth:`recv` above.
Returns the number of bytes sent. Applications are responsible for checking that
all data has been sent; if only some of the data was transmitted, the
- application needs to attempt delivery of the remaining data.
+ application needs to attempt delivery of the remaining data. For further
+ information on this topic, consult the :ref:`socket-howto`.
.. method:: socket.sendall(bytes[, flags])
@@ -1169,8 +1170,8 @@ using it. Note that a server must perform the sequence :func:`socket`,
:meth:`~socket.bind`, :meth:`~socket.listen`, :meth:`~socket.accept` (possibly
repeating the :meth:`~socket.accept` to service more than one client), while a
client only needs the sequence :func:`socket`, :meth:`~socket.connect`. Also
-note that the server does not :meth:`~socket.send`/:meth:`~socket.recv` on the
-socket it is listening on but on the new socket returned by
+note that the server does not :meth:`~socket.sendall`/:meth:`~socket.recv` on
+the socket it is listening on but on the new socket returned by
:meth:`~socket.accept`.
The first two examples support IPv4 only. ::
@@ -1188,7 +1189,7 @@ The first two examples support IPv4 only. ::
while True:
data = conn.recv(1024)
if not data: break
- conn.send(data)
+ conn.sendall(data)
conn.close()
::
@@ -1200,7 +1201,7 @@ The first two examples support IPv4 only. ::
PORT = 50007 # The same port as used by the server
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect((HOST, PORT))
- s.send(b'Hello, world')
+ s.sendall(b'Hello, world')
data = s.recv(1024)
s.close()
print('Received', repr(data))
@@ -1272,7 +1273,7 @@ sends traffic to the first one connected successfully. ::
if s is None:
print('could not open socket')
sys.exit(1)
- s.send(b'Hello, world')
+ s.sendall(b'Hello, world')
data = s.recv(1024)
s.close()
print('Received', repr(data))