diff options
author | Georg Brandl <georg@python.org> | 2010-06-12 09:50:02 +0000 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-06-12 09:50:02 +0000 |
commit | a232be1b0bd7758dadf8efe9b44f3c0345dc5eff (patch) | |
tree | 49e400ed71aa09065b0a393674787139bdf5248e /Doc/library/socket.rst | |
parent | 38b4a898fd4c624bde2e401ecdc28888ec41e6de (diff) | |
download | cpython-git-a232be1b0bd7758dadf8efe9b44f3c0345dc5eff.tar.gz |
Merged revisions 81940-81942 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81940 | georg.brandl | 2010-06-12 11:45:28 +0200 (Sa, 12 Jun 2010) | 1 line
Add document on how to build.
........
r81941 | georg.brandl | 2010-06-12 11:45:58 +0200 (Sa, 12 Jun 2010) | 1 line
Fix gratuitous indentation.
........
r81942 | georg.brandl | 2010-06-12 11:46:03 +0200 (Sa, 12 Jun 2010) | 1 line
Update README.
........
Diffstat (limited to 'Doc/library/socket.rst')
-rw-r--r-- | Doc/library/socket.rst | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index b2784b69e5..7fe07be456 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -72,18 +72,18 @@ numeric address in *host* portion. tuple, and the fields depend on the address type. The general tuple form is ``(addr_type, v1, v2, v3 [, scope])``, where: - - *addr_type* is one of TIPC_ADDR_NAMESEQ, TIPC_ADDR_NAME, or - TIPC_ADDR_ID. - - *scope* is one of TIPC_ZONE_SCOPE, TIPC_CLUSTER_SCOPE, and - TIPC_NODE_SCOPE. - - If *addr_type* is TIPC_ADDR_NAME, then *v1* is the server type, *v2* is - the port identifier, and *v3* should be 0. - - If *addr_type* is TIPC_ADDR_NAMESEQ, then *v1* is the server type, *v2* - is the lower port number, and *v3* is the upper port number. - - If *addr_type* is TIPC_ADDR_ID, then *v1* is the node, *v2* is the - reference, and *v3* should be set to 0. + - *addr_type* is one of TIPC_ADDR_NAMESEQ, TIPC_ADDR_NAME, or + TIPC_ADDR_ID. + - *scope* is one of TIPC_ZONE_SCOPE, TIPC_CLUSTER_SCOPE, and + TIPC_NODE_SCOPE. + - If *addr_type* is TIPC_ADDR_NAME, then *v1* is the server type, *v2* is + the port identifier, and *v3* should be 0. + + If *addr_type* is TIPC_ADDR_NAMESEQ, then *v1* is the server type, *v2* + is the lower port number, and *v3* is the upper port number. + + If *addr_type* is TIPC_ADDR_ID, then *v1* is the node, *v2* is the + reference, and *v3* should be set to 0. All errors raise exceptions. The normal exceptions for invalid argument types |