Commit696e4ed

committed

fix universal_newlines TypeError

1 parent1e4211b commit696e4edCopy full SHA for 696e4ed

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -772,6 +772,7 @@ def _kill_process(pid):`
`772`	`772`	`status=0`
`773`	`773`	`stdout_value=b''`
`774`	`774`	`stderr_value=b''`
	`775`	`+newline="\n"ifuniversal_newlineselseb"\n"`
`775`	`776`	`try:`
`776`	`777`	`ifoutput_streamisNone:`
`777`	`778`	`ifkill_after_timeout:`
`@@ -783,9 +784,9 @@ def _kill_process(pid):`
`783`	`784`	`stderr_value= ('Timeout: the command "%s" did not complete in %d '`
`784`	`785`	`'secs.'% (" ".join(command),kill_after_timeout)).encode(defenc)`
`785`	`786`	`# strip trailing "\n"`
`786`		`-ifstdout_value.endswith(b"\n"):`
	`787`	`+ifstdout_value.endswith(newline):`
`787`	`788`	`stdout_value=stdout_value[:-1]`
`788`		`-ifstderr_value.endswith(b"\n"):`
	`789`	`+ifstderr_value.endswith(newline):`
`789`	`790`	`stderr_value=stderr_value[:-1]`
`790`	`791`	`status=proc.returncode`
`791`	`792`	`else:`
`@@ -794,7 +795,7 @@ def _kill_process(pid):`
`794`	`795`	`stdout_value=proc.stdout.read()`
`795`	`796`	`stderr_value=proc.stderr.read()`
`796`	`797`	`# strip trailing "\n"`
`797`		`-ifstderr_value.endswith(b"\n"):`
	`798`	`+ifstderr_value.endswith(newline):`
`798`	`799`	`stderr_value=stderr_value[:-1]`
`799`	`800`	`status=proc.wait()`
`800`	`801`	`# END stdout handling`

Comments

(0)