From 156c47125313827e66797c50e91568cf0515b9a7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 25 Oct 2018 09:12:22 +0000 Subject: [PATCH] #853: python3 needs bytes here git-svn-id: https://xpra.org/svn/Xpra/trunk@20824 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/x11/prop_conv.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xpra/x11/prop_conv.py b/src/xpra/x11/prop_conv.py index 4db86f241b..1c46e3b090 100644 --- a/src/xpra/x11/prop_conv.py +++ b/src/xpra/x11/prop_conv.py @@ -16,7 +16,7 @@ from xpra.log import Logger log = Logger("x11", "window") -from xpra.os_util import hexstr, StringIOClass, PYTHON3 +from xpra.os_util import hexstr, BytesIOClass, PYTHON3 from xpra.x11.bindings.window_bindings import constants #@UnresolvedImport from xpra.x11.bindings.window_bindings import X11WindowBindings #@UnresolvedImport X11Window = X11WindowBindings() @@ -243,7 +243,7 @@ def _read_image(_disp, stream): # a _NET_WM_ICON property. def NetWMIcons(disp, data): icons = [] - stream = StringIOClass(data) + stream = BytesIOClass(data) while True: size_image = _read_image(disp, stream) if size_image is None: