[X2Go-Commits] [python-x2go] 01/01: x2go/backends/terminal/plain.py: With Python3, decode stderr reads.

[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 e45962c60a8e1e58c8c5517189b57dec536b18a8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 5 14:13:13 2018 +0100

    x2go/backends/terminal/plain.py: With Python3, decode stderr reads.
---
 x2go/backends/terminal/plain.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index ad388ad..16e0e82 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -33,6 +33,7 @@ __name__    = 'x2go.backends.terminal.plain'
 
 # modules
 import os
+import sys
 import types
 import gevent
 import io
@@ -1368,6 +1369,8 @@ class X2GoTerminalSession(object):
             self.logger('setting keyboard layout ,,%s\'\' and variant ,,%s\'\' for session %s has been successful' % (layout, variant, self.session_info), log.loglevel_NOTICE)
             return True
         else:
+            if sys.version_info[0] >= 3:
+               _stderr = _stderr.decode()
             self.logger('setting keyboard layout ,,%s\'\' and variant ,,%s\'\' for session %s failed: %s' % (layout, variant, self.session_info, _stderr.replace('\n', ' ')), log.loglevel_ERROR)
             return False
 

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