[Python-checkins] cpython (merge 3.2 -> default): #14535: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/957e2c71beef
changeset:   76298:957e2c71beef
parent:      76296:160245735299
parent:      76297:635966f6d3de
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Apr 13 20:52:29 2012 -0600
summary:
  #14535: merge with 3.2.

files:
  Doc/library/multiprocessing.rst |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1142,7 +1142,7 @@
     HELLO WORLD
     [(3.515625, 39.0625), (33.0625, 4.0), (5.640625, 90.25)]
 
-.. highlight:: python
+.. highlight:: python3
 
 
 .. _multiprocessing-managers:
@@ -2370,16 +2370,19 @@
 Demonstration of how to create and use customized managers and proxies:
 
 .. literalinclude:: ../includes/mp_newtype.py
+   :language: python3
 
 
 Using :class:`Pool`:
 
 .. literalinclude:: ../includes/mp_pool.py
+   :language: python3
 
 
 Synchronization types like locks, conditions and queues:
 
 .. literalinclude:: ../includes/mp_synchronize.py
+   :language: python3
 
 
 An example showing how to use queues to feed tasks to a collection of worker

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