Skip to content

Commit

Permalink
fix save_input_conf with python3: device_uuid is 'bytes' and python3 …
Browse files Browse the repository at this point in the history
…is being facetious

git-svn-id: https://xpra.org/svn/Xpra/trunk@23240 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 20, 2019
1 parent 1a06c63 commit f0d81af
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/xpra/x11/vfb_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit f0d81af

Please sign in to comment.