Commitf237620

authored

Merge pull request#682 from pabelanger/temp/encoding

Fix encoding issue with stderr_value and kill_after_timeout

2 parents95ff827 +1dbfd29 commitf237620Copy full SHA for f237620

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -780,8 +780,8 @@ def _kill_process(pid):`
`780`	`780`	`ifkill_after_timeout:`
`781`	`781`	`watchdog.cancel()`
`782`	`782`	`ifkill_check.isSet():`
`783`		`-stderr_value='Timeout: the command "%s" did not complete in %d ' \`
`784`		`-'secs.'% (" ".join(command),kill_after_timeout)`
	`783`	`+stderr_value=('Timeout: the command "%s" did not complete in %d '`
	`784`	`+'secs.'% (" ".join(command),kill_after_timeout)).encode(defenc)`
`785`	`785`	`# strip trailing "\n"`
`786`	`786`	`ifstdout_value.endswith(b"\n"):`
`787`	`787`	`stdout_value=stdout_value[:-1]`

Comments

(0)