Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix diffuse VCS-integration functionality 

python3 popen streams return byte-strings that needs to be decoded into strings
This commit is contained in:
Uffe Jakobsen 2020-03-19 10:53:34 +01:00
parent 813d6e7bba
commit 90ff95300f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/usr/bin/diffuse
View File

@ -1370,7 +1370,7 @@ def popenRead(dn, cmd, prefs, bash_pref, success_results=None):
# use popen to read the output of a command # use popen to read the output of a command
def popenReadLines(dn, cmd, prefs, bash_pref, success_results=None): 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 # simulate use of popen with xargs to read the output of a command
def popenXArgsReadLines(dn, cmd, args, prefs, bash_pref): def popenXArgsReadLines(dn, cmd, args, prefs, bash_pref):