From f0d81afb19289b2d4989316f205a7ac5913028a8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 20 Jul 2019 06:17:28 +0000 Subject: [PATCH] fix save_input_conf with python3: device_uuid is 'bytes' and python3 is being facetious git-svn-id: https://xpra.org/svn/Xpra/trunk@23240 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/x11/vfb_util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xpra/x11/vfb_util.py b/src/xpra/x11/vfb_util.py index a69fe82e75..a3a3613674 100644 --- a/src/xpra/x11/vfb_util.py +++ b/src/xpra/x11/vfb_util.py @@ -16,7 +16,7 @@ from xpra.os_util import ( setsid, shellsub, close_fds, setuidgid, getuid, getgid, - strtobytes, osexpand, monotonic_time, + strtobytes, bytestostr, osexpand, monotonic_time, POSIX, OSX, PYTHON3, ) from xpra.platform.displayfd import read_displayfd, parse_displayfd @@ -90,7 +90,7 @@ def cleanup_input_conf_files(): #create individual device files: def save_input_conf(xorg_conf_dir, i, dev_type, device_uuid, uid, gid): upper_dev_type = dev_type[:1].upper()+dev_type[1:] #ie: Pointer - product_name = "Xpra Virtual %s %s" % (upper_dev_type, device_uuid) + product_name = "Xpra Virtual %s %s" % (upper_dev_type, bytestostr(device_uuid)) identifier = "xpra-virtual-%s" % dev_type conf_file = os.path.join(xorg_conf_dir, "%02i-%s.conf" % (i, dev_type)) with open(conf_file, "wb") as f: