From 90ff95300fd103dbdd456a29672d61efa892731d Mon Sep 17 00:00:00 2001 From: Uffe Jakobsen Date: Thu, 19 Mar 2020 10:53:34 +0100 Subject: [PATCH] Fix diffuse VCS-integration functionality python3 popen streams return byte-strings that needs to be decoded into strings --- src/usr/bin/diffuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usr/bin/diffuse b/src/usr/bin/diffuse index 5da8d04..0fa3d28 100755 --- a/src/usr/bin/diffuse +++ b/src/usr/bin/diffuse @@ -1370,7 +1370,7 @@ def popenRead(dn, cmd, prefs, bash_pref, success_results=None): # use popen to read the output of a command def popenReadLines(dn, cmd, prefs, bash_pref, success_results=None): - return strip_eols(splitlines(popenRead(dn, cmd, prefs, bash_pref, success_results))) + return strip_eols(splitlines(popenRead(dn, cmd, prefs, bash_pref, success_results).decode('utf-8', errors='ignore'))) # simulate use of popen with xargs to read the output of a command def popenXArgsReadLines(dn, cmd, args, prefs, bash_pref):