summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-07-01 07:56:07 (GMT)
committerGeorg Brandl <georg@python.org>2012-07-01 07:56:07 (GMT)
commitc9d2fc390d7eee2bc8c19e029ea4958aa10a4922 (patch)
treee385a33dd2e707585497d8a68f2bfb65aaad11c2 /Doc/library
parente4870b511796293b5e6cb82809ea035c54079e90 (diff)
parent29feb1ffcaa45335c33fc0a8bade83304b238744 (diff)
downloadcpython-c9d2fc390d7eee2bc8c19e029ea4958aa10a4922.zip
cpython-c9d2fc390d7eee2bc8c19e029ea4958aa10a4922.tar.gz
cpython-c9d2fc390d7eee2bc8c19e029ea4958aa10a4922.tar.bz2
Merge with 3.2.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/multiprocessing.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index fe5b81f..edc1bb9 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -79,7 +79,8 @@ To show the individual process IDs involved, here is an expanded example::
def info(title):
print(title)
print('module name:', __name__)
- print('parent process:', os.getppid())
+ if hasattr(os, 'getppid'): # only available on Unix
+ print('parent process:', os.getppid())
print('process id:', os.getpid())
def f(name):