From 81a022580e270983962e7f89c27d16267f26104c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 12 May 2015 09:27:48 +0000 Subject: [PATCH] py3k fix: we must decode the string out of safe_exec git-svn-id: https://xpra.org/svn/Xpra/trunk@9320 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/sound/pulseaudio_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xpra/sound/pulseaudio_util.py b/src/xpra/sound/pulseaudio_util.py index b081bc4db4..77e2756120 100755 --- a/src/xpra/sound/pulseaudio_util.py +++ b/src/xpra/sound/pulseaudio_util.py @@ -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!?