From: Gregory P. Smith <greg@krypto.org>
Date: Mon, 23 May 2011 05:16:57 +0000 (-0700)
Subject: Refer to the return value on nameindex and friends as a string, not a byte
X-Git-Tag: v3.3.0a1~2186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6352298ac4fd69d80fe33dfca84bd8bd6fe79672;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 5b2e6bd7d5d5..7ce7705a11e8 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.