summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2011-05-23 05:16:57 (GMT)
committerGregory P. Smith <greg@krypto.org>2011-05-23 05:16:57 (GMT)
commit6352298ac4fd69d80fe33dfca84bd8bd6fe79672 (patch)
treeae359a928bf581b45cece8debfecaaa07d402b8f /Doc
parentabe38da6a404949b5e5ac4f88c996e4574d1df92 (diff)
downloadcpython-6352298ac4fd69d80fe33dfca84bd8bd6fe79672.zip
cpython-6352298ac4fd69d80fe33dfca84bd8bd6fe79672.tar.gz
cpython-6352298ac4fd69d80fe33dfca84bd8bd6fe79672.tar.bz2
Refer to the return value on nameindex and friends as a string, not a byte
string. The code was fixed to return strings instead of bytes and to accept either.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/socket.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 5b2e6bd..7ce7705 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -539,7 +539,7 @@ The module :mod:`socket` exports the following constants and functions:
.. function:: if_nameindex()
Returns a list of network interface information
- (index, name as a byte string) tuples.
+ (index, name as a string) tuples.
:exc:`socket.error` if the system call fails for any reason.
Availability: Unix.
@@ -550,7 +550,7 @@ The module :mod:`socket` exports the following constants and functions:
.. function:: if_nametoindex(if_name)
Returns a network interface index number corresponding to an
- interface name byte string.
+ interface name string.
:exc:`socket.error` if no interface with the given name exists.
Availability: Unix.
@@ -560,7 +560,7 @@ The module :mod:`socket` exports the following constants and functions:
.. function:: if_indextoname(if_index)
- Returns a network interface name byte string corresponding to a
+ Returns a network interface name string corresponding to a
interface index.
:exc:`socket.error` if no interface with the given index exists.