From 902679c47c3d1238833ac9c9fdbc7c0ddbedf509 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 26 May 2016 19:51:09 +0200 Subject: fix(remote): py3 compatibility Related to #444 --- git/remote.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git/remote.py b/git/remote.py index b440e2cc..92203588 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, safe_decode) +from git.compat import (defenc, force_text) 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 = safe_decode(line) + line = force_text(line) for pline in progress_handler(line): if line.startswith('fatal:') or line.startswith('error:'): raise GitCommandError(("Error when fetching: %s" % line,), 2) -- cgit v1.2.1