Commit9c5b87b

committed

Merge pull requestgitpython-developers#150 from derenio/0.3

Merged fd leaks fix from the master to the 0.3 version

2 parents9ea3dbd +b137f55 commit9c5b87bCopy full SHA for 9c5b87b

File tree

-0

lines changed

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ def __init__(self, proc, args ):`
`74`	`74`	`self.args=args`
`75`	`75`
`76`	`76`	`def__del__(self):`
	`77`	`+self.proc.stdout.close()`
	`78`	`+self.proc.stderr.close()`
	`79`	`+`
`77`	`80`	`# did the process finish already so we have a return code ?`
`78`	`81`	`ifself.proc.poll()isnotNone:`
`79`	`82`	`return`
`@@ -85,6 +88,8 @@ def __del__(self):`
`85`	`88`	`# try to kill it`
`86`	`89`	`try:`
`87`	`90`	`os.kill(self.proc.pid,2)# interrupt signal`
	`91`	`+exceptOSError:`
	`92`	`+pass# ignore error when process already died`
`88`	`93`	`exceptAttributeError:`
`89`	`94`	`# try windows`
`90`	`95`	`# for some reason, providing None for stdout/stderr still prints something. This is why`
`@@ -101,6 +106,8 @@ def wait(self):`
`101`	`106`
`102`	`107`	`:raise GitCommandError: if the return status is not 0"""`
`103`	`108`	`status=self.proc.wait()`
	`109`	`+self.proc.stdout.close()`
	`110`	`+self.proc.stderr.close()`
`104`	`111`	`ifstatus!=0:`
`105`	`112`	`raiseGitCommandError(self.args,status,self.proc.stderr.read())`
`106`	`113`	`# END status handling`

Comments

(0)