commit 90ff95300fd103dbdd456a29672d61efa892731d (HEAD -> refs/heads/uj_vcs_fixes, refs/remotes/origin/uj_vcs_fixes) Author: Uffe Jakobsen AuthorDate: Thu Mar 19 10:53:34 2020 +0100 Commit: Uffe Jakobsen CommitDate: Thu Mar 19 10:56:14 2020 +0100 Fix diffuse VCS-integration functionality python3 popen streams return byte-strings that needs to be decoded into strings --- :100755 100755 5da8d04 0fa3d28 M src/usr/bin/diffuse src/usr/bin/diffuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git src/usr/bin/diffuse src/usr/bin/diffuse index 5da8d04..0fa3d28 100755 --- src/usr/bin/diffuse +++ 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):