Merge pull request #150 from derenio/0.3

Merged fd leaks fix from the master to the 0.3 version

1 files changed, 7 insertions, 0 deletions

diff --git a/git/cmd.py b/git/cmd.py
index 49487650..bd7d5b92 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -74,6 +74,9 @@ class Git(LazyMixin):
             self.args = args
             
         def __del__(self):
+            self.proc.stdout.close()
+            self.proc.stderr.close()
+
             # did the process finish already so we have a return code ?
             if self.proc.poll() is not None:
                 return
@@ -85,6 +88,8 @@ class Git(LazyMixin):
             # try to kill it
             try:
                 os.kill(self.proc.pid, 2)   # interrupt signal
+            except OSError:
+                pass # ignore error when process already died
             except AttributeError:
                 # try windows 
                 # for some reason, providing None for stdout/stderr still prints something. This is why 
@@ -101,6 +106,8 @@ class Git(LazyMixin):
             
             :raise GitCommandError: if the return status is not 0"""
             status = self.proc.wait()
+            self.proc.stdout.close()
+            self.proc.stderr.close()
             if status != 0:
                 raise GitCommandError(self.args, status, self.proc.stderr.read())
             # END status handling