diff options
| author | Dave Cole <djc@object-craft.com.au> | 2004-08-23 05:16:23 (GMT) |
|---|---|---|
| committer | Dave Cole <djc@object-craft.com.au> | 2004-08-23 05:16:23 (GMT) |
| commit | 07fda7e3a041cabb4bb375f07b7a461e0966d1c1 (patch) | |
| tree | 91bfb8d494166952019f2a365719f63ed8ab3ad6 | |
| parent | 0fc85754120bf6cd7d97894f48f37115490f46c6 (diff) | |
| download | cpython-07fda7e3a041cabb4bb375f07b7a461e0966d1c1.zip cpython-07fda7e3a041cabb4bb375f07b7a461e0966d1c1.tar.gz cpython-07fda7e3a041cabb4bb375f07b7a461e0966d1c1.tar.bz2 | |
Updated the socketpair() docstring and documentation to explain that the
default famility is AF_UNIX if defined for the platform, otherwise the
default is AF_INET.
| -rw-r--r-- | Doc/lib/libsocket.tex | 5 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Doc/lib/libsocket.tex b/Doc/lib/libsocket.tex index 73590b4..762d762 100644 --- a/Doc/lib/libsocket.tex +++ b/Doc/lib/libsocket.tex @@ -307,8 +307,9 @@ success, a new \class{SSLObject} is returned. Build a pair of connected socket objects using the given address family, socket type and protocol number. Address family, socket type and protocol number are as for the \function{socket()} function above. -Availability: \UNIX. -\versionadded{2.4} +The default family is AF_UNIX if defined for the platform, otherwise +the default is AF_INET. +Availability: \UNIX. \versionadded{2.4} \end{funcdesc} \begin{funcdesc}{fromfd}{fd, family, type\optional{, proto}} diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index a9a7b00..4249045 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -3011,7 +3011,8 @@ Return the protocol number for the named protocol. (Rarely used.)"); #ifdef HAVE_SOCKETPAIR /* Create a pair of sockets using the socketpair() function. - Arguments as for socket(). */ + Arguments as for socket() except the default family is AF_UNIX if + defined for the platform, otherwise the default is AF_INET. */ /*ARGSUSED*/ static PyObject * @@ -3058,7 +3059,8 @@ PyDoc_STRVAR(socketpair_doc, \n\ Create a pair of socket objects from the sockets returned by the platform\n\ socketpair() function.\n\ -The arguments are the same as for socket()."); +The arguments are the same as for socket() except the default family is\n\ +AF_UNIX if defined for the platform, otherwise the default is AF_INET."); #endif /* HAVE_SOCKETPAIR */ |