summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-05-26 19:50:05 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-05-26 19:50:05 +0200
commit5efdad2502098a2bd3af181931dc011501a13904 (patch)
tree400853cf0a62c9d1924409ebdfd2883d41e5785c
parent515a6b9ccf87bd1d3f5f2edd229d442706705df5 (diff)
downloadgitpython-5efdad2502098a2bd3af181931dc011501a13904.tar.gz
fix(remote): py3 compatibility
-rw-r--r--git/remote.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git/remote.py b/git/remote.py
index 169d4f79..b440e2cc 100644
--- a/git/remote.py
+++ b/git/remote.py
@@ -32,7 +32,7 @@ from git.util import (
)
from git.cmd import handle_process_output
from gitdb.util import join
-from git.compat import defenc
+from git.compat import (defenc, safe_decode)
import logging
log = logging.getLogger('git.remote')
@@ -551,7 +551,7 @@ class Remote(LazyMixin, Iterable):
progress_handler = progress.new_message_handler()
for line in proc.stderr:
- line = line.decode(defenc)
+ line = safe_decode(line)
for pline in progress_handler(line):
if line.startswith('fatal:') or line.startswith('error:'):
raise GitCommandError(("Error when fetching: %s" % line,), 2)