diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-07-29 15:40:30 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-07-29 15:40:30 (GMT) |
| commit | a44c6b325f21647a48f787215f0959de887ae08b (patch) | |
| tree | 992a5e3564537cb0161a83dd9ed0d777000936ac /Lib/multiprocessing | |
| parent | 0c40786c7351639e6d71573c4050143c478c4a58 (diff) | |
| download | cpython-a44c6b325f21647a48f787215f0959de887ae08b.zip cpython-a44c6b325f21647a48f787215f0959de887ae08b.tar.gz cpython-a44c6b325f21647a48f787215f0959de887ae08b.tar.bz2 | |
Merged revisions 74063 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
NB: the news item for r73708 seems to have inadvertently been included in a
different, unrelated merge set (r74055). I restored it here.
................
r74063 | alexandre.vassalotti | 2009-07-17 08:07:01 -0400 (Fri, 17 Jul 2009) | 17 lines
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')
| -rw-r--r-- | Lib/multiprocessing/process.py | 3 |
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 |