Commit9feb091

committed

devnull hack for 2.7

1 parentb32db82 commit9feb091Copy full SHA for 9feb091

File tree

-12

lines changed

-12

lines changed

Lines changed: 6 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -965,26 +965,20 @@ def _execute_utility(util, args, logfile, write_to_pipe=True):`
`965`	`965`	`stdout of executed utility.`
`966`	`966`	`"""`
`967`	`967`
`968`		`-withopen(logfile,"a")asfile_out:`
`969`		`-stdout_file=subprocess.DEVNULL`
`970`		`-stderr_file=subprocess.DEVNULL`
	`968`	`+withopen(logfile,"a")asfile_out, \`
	`969`	`+open(os.devnull,"w")asdevnull:# hack for 2.7`
`971`	`970`
`972`		`-ifwrite_to_pipe:`
`973`		`-stdout_file=subprocess.PIPE`
`974`		`-stderr_file=subprocess.STDOUT`
	`971`	`+# choose file according to options`
	`972`	`+stdout_file=subprocess.PIPEifwrite_to_pipeelsedevnull`
`975`	`973`
`976`	`974`	`# run utility`
`977`	`975`	`process=subprocess.Popen([get_bin_path(util)]+args,`
`978`	`976`	`stdout=stdout_file,`
`979`		`-stderr=stderr_file)`
	`977`	`+stderr=subprocess.STDOUT)`
`980`	`978`
`981`	`979`	`# get result`
`982`	`980`	`out,_=process.communicate()`
`983`		`-`
`984`		`-ifout:`
`985`		`-out=out.decode('utf-8')`
`986`		`-else:`
`987`		`-out=""`
	`981`	`+out=''ifnotoutelseout.decode('utf-8')`
`988`	`982`
`989`	`983`	`# write new log entry`
`990`	`984`	`file_out.write(''.join(map(lambdax:str(x)+' ', [util]+args)))`

Comments

(0)