From: Éric Araujo <merwok@netwok.org>
Date: Tue, 29 Nov 2011 16:14:27 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~714
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8e032006a608f14f9463f06f4d466fd367b37f3;p=python

Merge 3.2
---

c8e032006a608f14f9463f06f4d466fd367b37f3
diff --cc Doc/library/socket.rst
index 17a99e2b37,ef81c4d4f7..f507958fab
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@@ -64,27 -64,22 +64,27 @@@ Socket addresses are represented as fol
    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
+   - *addr_type* is one of :const:`TIPC_ADDR_NAMESEQ`, :const:`TIPC_ADDR_NAME`,
+     or :const:`TIPC_ADDR_ID`.
+   - *scope* is one of :const:`TIPC_ZONE_SCOPE`, :const:`TIPC_CLUSTER_SCOPE`, and
+     :const:`TIPC_NODE_SCOPE`.
+   - If *addr_type* is :const:`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*
+     If *addr_type* is :const:`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
+     If *addr_type* is :const:`TIPC_ADDR_ID`, then *v1* is the node, *v2* is the
      reference, and *v3* should be set to 0.
  
-     If *addr_type* is TIPC_ADDR_ID, then *v1* is the node, *v2* is the
+     If *addr_type* is :const:`TIPC_ADDR_ID`, then *v1* is the node, *v2* is the
      reference, and *v3* should be set to 0.
  
 +- A tuple ``(interface, )`` is used for the :const:`AF_CAN` address family,
 +  where *interface* is a string representing a network interface name like
 +  ``'can0'``. The network interface name ``''`` can be used to receive packets
 +  from all network interfaces of this family.
 +
  - Certain other address families (:const:`AF_BLUETOOTH`, :const:`AF_PACKET`)
    support specific representations.
  
diff --cc Lib/test/regrtest.py
index cfae1f00e8,c3d2a2b1e2..af114168a9
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@@ -177,7 -165,7 +177,8 @@@ import packaging.databas
  import platform
  import random
  import re
+ import shutil
 +import signal
  import sys
  import sysconfig
  import tempfile
diff --cc Misc/ACKS
index b8e5881b94,4effde36af..70a42e2013
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -975,9 -903,9 +975,10 @@@ Oren Tiros
  Jason Tishler
  Christian Tismer
  Frank J. Tobin
 -R Lindsay Todd
  Bennett Todd
 +R Lindsay Todd
 +Eugene Toder
+ Erik Tollerud
  Matias Torchinsky
  Sandro Tosi
  Richard Townsend