Skip to content

Commit

Permalink
py3k fix: we must decode the string out of safe_exec
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@9320 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed May 12, 2015
1 parent 1644d9b commit 81a0225
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/xpra/sound/pulseaudio_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def which(name):
returncode, out, _ = safe_exec(cmd, log_errors=False)
if returncode!=0 or not out:
return ""
c = out.replace("\n", "").replace("\r", "")
c = out.decode("utf8").replace("\n", "").replace("\r", "")
if os.path.exists(c) and os.path.isfile(c):
if os.name=="posix" and not os.access(c, os.X_OK):
#odd, it's there but we can't run it!?
Expand Down

0 comments on commit 81a0225

Please sign in to comment.