[Python-checkins] cpython (merge 3.2 -> default): Merge

Fri Aug 17 15:43:38 CEST 2012

http://hg.python.org/cpython/rev/357d78d739f9
changeset: 78615:357d78d739f9
parent: 78613:12c062dbe746
parent: 78614:636f75da4b9e
user: Richard Oudkerk <shibturn at gmail.com>
date: Fri Aug 17 14:42:43 2012 +0100
summary:
 Merge
files:
 Doc/library/multiprocessing.rst | 41 ++++++++++----------
 1 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1207,10 +1207,10 @@
 *address* is the address on which the manager process listens for new
 connections. If *address* is ``None`` then an arbitrary one is chosen.
 
- *authkey* is the authentication key which will be used to check the validity
- of incoming connections to the server process. If *authkey* is ``None`` then
- ``current_process().authkey``. Otherwise *authkey* is used and it
- must be a string.
+ *authkey* is the authentication key which will be used to check the
+ validity of incoming connections to the server process. If
+ *authkey* is ``None`` then ``current_process().authkey`` is used.
+ Otherwise *authkey* is used and it must be a byte string.
 
 .. method:: start([initializer[, initargs]])
 
@@ -1224,7 +1224,7 @@
 :meth:`serve_forever` method::
 
 >>> from multiprocessing.managers import BaseManager
- >>> manager = BaseManager(address=('', 50000), authkey='abc')
+ >>> manager = BaseManager(address=('', 50000), authkey=b'abc')
 >>> server = manager.get_server()
 >>> server.serve_forever()
 
@@ -1235,7 +1235,7 @@
 Connect a local manager object to a remote manager process::
 
 >>> from multiprocessing.managers import BaseManager
- >>> m = BaseManager(address=('127.0.0.1', 5000), authkey='abc')
+ >>> m = BaseManager(address=('127.0.0.1', 5000), authkey=b'abc')
 >>> m.connect()
 
 .. method:: shutdown()
@@ -1454,7 +1454,7 @@
 >>> queue = queue.Queue()
 >>> class QueueManager(BaseManager): pass
 >>> QueueManager.register('get_queue', callable=lambda:queue)
- >>> m = QueueManager(address=('', 50000), authkey='abracadabra')
+ >>> m = QueueManager(address=('', 50000), authkey=b'abracadabra')
 >>> s = m.get_server()
 >>> s.serve_forever()
 
@@ -1463,7 +1463,7 @@
 >>> from multiprocessing.managers import BaseManager
 >>> class QueueManager(BaseManager): pass
 >>> QueueManager.register('get_queue')
- >>> m = QueueManager(address=('foo.bar.org', 50000), authkey='abracadabra')
+ >>> m = QueueManager(address=('foo.bar.org', 50000), authkey=b'abracadabra')
 >>> m.connect()
 >>> queue = m.get_queue()
 >>> queue.put('hello')
@@ -1473,7 +1473,7 @@
 >>> from multiprocessing.managers import BaseManager
 >>> class QueueManager(BaseManager): pass
 >>> QueueManager.register('get_queue')
- >>> m = QueueManager(address=('foo.bar.org', 50000), authkey='abracadabra')
+ >>> m = QueueManager(address=('foo.bar.org', 50000), authkey=b'abracadabra')
 >>> m.connect()
 >>> queue = m.get_queue()
 >>> queue.get()
@@ -1497,7 +1497,7 @@
 >>> class QueueManager(BaseManager): pass
 ...
 >>> QueueManager.register('get_queue', callable=lambda: queue)
- >>> m = QueueManager(address=('', 50000), authkey='abracadabra')
+ >>> m = QueueManager(address=('', 50000), authkey=b'abracadabra')
 >>> s = m.get_server()
 >>> s.serve_forever()
 
@@ -1865,9 +1865,9 @@
 generally be omitted since it can usually be inferred from the format of
 *address*. (See :ref:`multiprocessing-address-formats`)
 
- If *authenticate* is ``True`` or *authkey* is a string then digest
+ If *authenticate* is ``True`` or *authkey* is a byte string then digest
 authentication is used. The key used for authentication will be either
- *authkey* or ``current_process().authkey)`` if *authkey* is ``None``.
+ *authkey* or ``current_process().authkey`` if *authkey* is ``None``.
 If authentication fails then
 :exc:`~multiprocessing.AuthenticationError` is raised. See
 :ref:`multiprocessing-auth-keys`.
@@ -1903,8 +1903,8 @@
 If *authenticate* is ``True`` (``False`` by default) or *authkey* is not
 ``None`` then digest authentication is used.
 
- If *authkey* is a string then it will be used as the authentication key;
- otherwise it must be *None*.
+ If *authkey* is a byte string then it will be used as the
+ authentication key; otherwise it must be *None*.
 
 If *authkey* is ``None`` and *authenticate* is ``True`` then
 ``current_process().authkey`` is used as the authentication key. If
@@ -2081,12 +2081,13 @@
 risk. Therefore :class:`Listener` and :func:`Client` use the :mod:`hmac` module
 to provide digest authentication.
 
-An authentication key is a string which can be thought of as a password: once a
-connection is established both ends will demand proof that the other knows the
-authentication key. (Demonstrating that both ends are using the same key does
-**not** involve sending the key over the connection.)
-
-If authentication is requested but do authentication key is specified then the
+An authentication key is a byte string which can be thought of as a
+password: once a connection is established both ends will demand proof
+that the other knows the authentication key. (Demonstrating that both
+ends are using the same key does **not** involve sending the key over
+the connection.)
+
+If authentication is requested but no authentication key is specified then the
 return value of ``current_process().authkey`` is used (see
 :class:`~multiprocessing.Process`). This value will automatically inherited by
 any :class:`~multiprocessing.Process` object that the current process creates.
-- 
Repository URL: http://hg.python.org/cpython
