summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/process.py
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2009-07-17 12:07:01 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2009-07-17 12:07:01 (GMT)
commitc57a84f41a5d7763d1cd0b648d10479d9c0c6d08 (patch)
tree75b6dbc2fdd5603dba0ebb981a6ceca7f9037845 /Lib/multiprocessing/process.py
parent260484d12aae264ac524f8c9285bec2cf43fa44e (diff)
downloadcpython-c57a84f41a5d7763d1cd0b648d10479d9c0c6d08.zip
cpython-c57a84f41a5d7763d1cd0b648d10479d9c0c6d08.tar.gz
cpython-c57a84f41a5d7763d1cd0b648d10479d9c0c6d08.tar.bz2
Merged revisions 73694,73708,73738 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73694 | jesse.noller | 2009-06-29 14:24:26 -0400 (Mon, 29 Jun 2009) | 1 line Issue 5740: multiprocessing.connection.* authkey fixes ........ r73708 | jesse.noller | 2009-06-30 13:11:52 -0400 (Tue, 30 Jun 2009) | 1 line Resolves issues 5155, 5313, 5331 - bad file descriptor error with processes in processes ........ r73738 | r.david.murray | 2009-06-30 22:49:10 -0400 (Tue, 30 Jun 2009) | 2 lines Make punctuation prettier and break up run-on sentence. ........
Diffstat (limited to 'Lib/multiprocessing/process.py')
-rw-r--r--Lib/multiprocessing/process.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index 4a06a45..1a5c25f 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -221,7 +221,8 @@ class Process(object):
self._counter = itertools.count(1)
if sys.stdin is not None:
try:
- os.close(sys.stdin.fileno())
+ sys.stdin.close()
+ sys.stdin = open(os.devnull)
except (OSError, ValueError):
pass
_current_process = self