Fix encoding issue with stderr_value and kill_after_timeout

pabelanger · pabelanger · commit 1dbfd290609f · 2017-10-05T13:26:26.000-04:00
We don't properly encode our error message under python3.

Signed-off-by: Paul Belanger &lt;pabelanger@redhat.com&gt;
diff --git a/git/cmd.py b/git/cmd.py
@@ -780,8 +780,8 @@ def _kill_process(pid):
 if kill_after_timeout:
 watchdog.cancel()
 if kill_check.isSet():
- stderr_value = 'Timeout: the command "%s" did not complete in %d ' \
- 'secs.' % (" ".join(command), kill_after_timeout)
+ stderr_value = ('Timeout: the command "%s" did not complete in %d '
+ 'secs.' % (" ".join(command), kill_after_timeout)).encode(defenc)
 # strip trailing "\n"
 if stdout_value.endswith(b"\n"):
 stdout_value = stdout_value[:-1]

-Original file line number
+Diff line change
 ifkill_after_timeout:
 watchdog.cancel()
 ifkill_check.isSet():
 -stderr_value='Timeout: the command "%s" did not complete in %d ' \
 -'secs.'% (" ".join(command), kill_after_timeout)
 +stderr_value=('Timeout: the command "%s" did not complete in %d '
 +'secs.'% (" ".join(command), kill_after_timeout)).encode(defenc)
 # strip trailing "\n"
 ifstdout_value.endswith(b"\n"):
 stdout_value=stdout_value[:-1]