[X2Go-Commits] [python-x2go] 01/02: X2GoControlSession.get_server_versions(): Fix another Py3 issue where we forgot decoding stdout before applying string operations.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit d383eb79567677a5be1756ec0fd991f8d82e7a2f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 10 22:45:46 2018 +0100

    X2GoControlSession.get_server_versions(): Fix another Py3 issue where we forgot decoding stdout before applying string operations.
---
 debian/changelog               | 2 ++
 x2go/backends/control/plain.py | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d7a72b0..ce947ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-x2go (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
   * New upstream version 0.6.0.2:
     - Support try-resuming of rootless or published applications sessions
       (required for pyhoca-cli --try-resume).
+    - X2GoControlSession.get_server_versions(): Fix another Py3 issue where
+      we forgot decoding stdout before applying string operations.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 18 Sep 2018 21:17:35 +0200
 
diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py
index 8d708cb..dcc2b43 100644
--- a/x2go/backends/control/plain.py
+++ b/x2go/backends/control/plain.py
@@ -575,7 +575,10 @@ class X2GoControlSession(paramiko.SSHClient):
         if self._server_versions is None:
             self._server_versions = {}
             (stdin, stdout, stderr) = self._x2go_exec_command('which x2goversion >/dev/null && x2goversion')
-            _lines = stdout.read().split('\n')
+            if sys.version_info[0] >= 3:
+                _lines = stdout.read().decode().split('\n')
+            else:
+                _lines = stdout.read().split('\n')
             for _line in _lines:
                 if ':' not in _line: continue
                 comp = _line.split(':')[0].strip()

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git