[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #24984: Merge 3.4 into 3.5

[martin.panter]

https://hg.python.org/cpython/rev/4ce8450da22d
changeset:   97805:4ce8450da22d
branch:      3.5
parent:      97802:31745f7dc802
parent:      97804:da9b26670e44
user:        Martin Panter <vadmium>
date:        Wed Sep 09 06:48:55 2015 +0000
summary:
  Issue #24984: Merge 3.4 into 3.5

files:
  Doc/library/socket.rst |  26 ++++++++++++++++++++++++--
  Misc/ACKS              |   1 +
  2 files changed, 25 insertions(+), 2 deletions(-)


diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -106,8 +106,30 @@
 
   .. versionadded:: 3.3
 
-- Certain other address families (:const:`AF_BLUETOOTH`, :const:`AF_PACKET`,
-  :const:`AF_CAN`) support specific representations.
+- :const:`AF_BLUETOOTH` supports the following protocols and address
+  formats:
+
+  - :const:`BTPROTO_L2CAP` accepts ``(bdaddr, psm)`` where ``bdaddr`` is
+    the Bluetooth address as a string and ``psm`` is an integer.
+
+  - :const:`BTPROTO_RFCOMM` accepts ``(bdaddr, channel)`` where ``bdaddr``
+    is the Bluetooth address as a string and ``channel`` is an integer.
+
+  - :const:`BTPROTO_HCI` accepts ``(device_id,)`` where ``device_id`` is
+    either an integer or a string with the Bluetooth address of the
+    interface. (This depends on your OS; NetBSD and DragonFlyBSD expect
+    a Bluetooth address while everything else expects an integer.)
+
+    .. versionchanged:: 3.2
+       NetBSD and DragonFlyBSD support added.
+
+  - :const:`BTPROTO_SCO` accepts ``bdaddr`` where ``bdaddr`` is a
+    :term:`bytes-like object` containing the Bluetooth address in a
+    string format. (ex. ``b'12:23:34:45:56:67'``) This protocol is not
+    supported under FreeBSD.
+
+- Certain other address families (:const:`AF_PACKET`, :const:`AF_CAN`)
+  support specific representations.
 
   .. XXX document them!
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1424,6 +1424,7 @@
 July Tikhonov
 Tracy Tims
 Oren Tirosh
+Tim Tisdall
 Jason Tishler
 Christian Tismer
 Jim Tittsler

-- 
Repository URL: https://hg.python.org/cpython