gevent/subprocess.py: prevent double close of a file descriptor

452536b1 · Denis Bilenko · e3d395dd · 452536b1
Commit 452536b1 authored May 28, 2012 by Denis Bilenko
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

gevent/subprocess.py gevent/subprocess.py +6 -7

No files found.
--- a/gevent/subprocess.py
+++ b/gevent/subprocess.py
@@ -698,14 +698,13 @@ class Popen(object):
                # Wait for exec to fail or succeed; possibly raising exception
                # Exception limited to 1M
-                data = FileObject(errpipe_read, 'rb').read(1048576)
+                errpipe_read = FileObject(errpipe_read, 'rb')
-                errpipe_read = None
+                data = errpipe_read.read(1048576)
            finally:
-                try:
+                if hasattr(errpipe_read, 'close'):
-                    if errpipe_read is not None:
+                    errpipe_read.close()
+                else:
                    os.close(errpipe_read)
-                except EnvironmentError:
-                    pass
            if data != "":
                self.wait()