This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 413c85afc376a114aa7cedd945fe606a8dd68583 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 15 13:25:51 2018 +0200 x2go/utils.py: Python3 fix in get_workarea_geometry(). --- debian/changelog | 1 + x2go/utils.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 35b6903..80e9b73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ python-x2go (0.5.99.1-0x2go1) UNRELEASED; urgency=medium (Fixes: #1259). - x2go/checkhosts.py: Python3 fix in get_key_fingerprint(). - Natively support xinerama option. + - x2go/utils.py: Python3 fix in get_workarea_geometry(). * debian/: Adapt to building API docs with Sphinx. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 22 Sep 2017 14:15:05 +0200 diff --git a/x2go/utils.py b/x2go/utils.py index 2edecd9..8d19c0c 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -692,7 +692,10 @@ def get_workarea_geometry(): """ if _X2GOCLIENT_OS != 'Windows': p = subprocess.Popen(['xprop', '-root', '_NET_WORKAREA',], stdout=subprocess.PIPE, ) - _list = p.stdout.read().rstrip('\n').split(',') + if sys.version_info[0] >= 3: + _list = p.stdout.read().decode().rstrip('\n').split(',') + else: + _list = p.stdout.read().rstrip('\n').split(',') if len(_list) == 4: return (_list[2].strip(), _list[3].strip()) else: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git