Commit3c19a6e

authored and

committed

fix universal_newlines TypeError

1 parent4a1339a commit3c19a6eCopy full SHA for 3c19a6e

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,9 @@ def _kill_process(pid):`
`785`	`785`	`watchdog.cancel()`
`786`	`786`	`ifkill_check.isSet():`
`787`	`787`	`stderr_value= ('Timeout: the command "%s" did not complete in %d '`
`788`		`-'secs.'% (" ".join(command),kill_after_timeout)).encode(defenc)`
	`788`	`+'secs.'% (" ".join(command),kill_after_timeout))`
	`789`	`+ifnotuniversal_newlines:`
	`790`	`+stderr_value=stderr_value.encode(defenc)`
`789`	`791`	`# strip trailing "\n"`
`790`	`792`	`ifstdout_value.endswith(newline):`
`791`	`793`	`stdout_value=stdout_value[:-1]`

Comments

(0)