diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2017-10-07 07:37:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 07:37:56 +0200 |
| commit | f237620189a55d491b64cac4b5dc01b832cb3cbe (patch) | |
| tree | 361198ce27124885c231d010521b4a3ee004150a | |
| parent | 95ff8274a0a0a723349416c60e593b79d16227dc (diff) | |
| parent | 1dbfd290609fe43ca7d94e06cea0d60333343838 (diff) | |
| download | gitpython-f237620189a55d491b64cac4b5dc01b832cb3cbe.tar.gz | |
Merge pull request #682 from pabelanger/temp/encoding
Fix encoding issue with stderr_value and kill_after_timeout
| -rw-r--r-- | git/cmd.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -780,8 +780,8 @@ class Git(LazyMixin): 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] |