summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-06-04 10:21:10 (GMT)
committerGeorg Brandl <georg@python.org>2009-06-04 10:21:10 (GMT)
commit3cfdd9c1d53bdcc95b3779caaa2ab5953b604797 (patch)
treebc4ebcb01dabdce9bd671324faef32000f3176b6 /Doc
parent706824f19f734e5e567f32d989376547c0ae08da (diff)
downloadcpython-3cfdd9c1d53bdcc95b3779caaa2ab5953b604797.zip
cpython-3cfdd9c1d53bdcc95b3779caaa2ab5953b604797.tar.gz
cpython-3cfdd9c1d53bdcc95b3779caaa2ab5953b604797.tar.bz2
Merged revisions 73186,73206,73212 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73186 | georg.brandl | 2009-06-03 23:21:09 +0200 (Mi, 03 Jun 2009) | 1 line #6174: fix indentation in code example. ........ r73206 | georg.brandl | 2009-06-04 11:15:12 +0200 (Do, 04 Jun 2009) | 1 line #3584: ignore trailing newlines when placing the caret for a SyntaxError location. ........ r73212 | georg.brandl | 2009-06-04 12:10:41 +0200 (Do, 04 Jun 2009) | 1 line Better name for "Ctor". ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/whatsnew/2.6.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index df0b589..fc1525e 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -682,15 +682,15 @@ and :meth:`Semaphore` to create shared locks.)
for N in range(1, 1000, 10):
p.apply_async(factorial, (N, d))
- # Mark pool as closed -- no more tasks can be added.
- p.close()
+ # Mark pool as closed -- no more tasks can be added.
+ p.close()
- # Wait for tasks to exit
- p.join()
+ # Wait for tasks to exit
+ p.join()
- # Output results
- for k, v in sorted(d.items()):
- print k, v
+ # Output results
+ for k, v in sorted(d.items()):
+ print k, v
This will produce the output::