[X2Go-Commits] [pyhoca-gui] 03/09: More porting to Python 3 (manually).

[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 pyhoca-gui.

commit a093f28f80a25b67523a654e99f954c3e0448d01
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Dec 2 10:28:06 2019 +0100

    More porting to Python 3 (manually).
---
 pyhoca/wxgui/launcher.py | 9 +++++++--
 setup.py                 | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py
index 0c8e5d4..91e2d94 100644
--- a/pyhoca/wxgui/launcher.py
+++ b/pyhoca/wxgui/launcher.py
@@ -112,7 +112,12 @@ VERSION: %s
 
             p = subprocess.Popen(['ps', '-U', CURRENT_LOCAL_USER, '-u', CURRENT_LOCAL_USER], stdout=subprocess.PIPE)
             psA_out = p.communicate()
-            if psA_out[0].count(_executable) <= 1:
+            if sys.version_info[0] < 3:
+                num_of_processes = psA_out[0].count(_executable)
+            else:
+                num_of_processes = psA_out[0].count(_executable.encode())
+
+            if num_of_processes <= 1:
 
                 if os.path.isdir(os.path.expanduser("~/.x2go/{progname}/".format(progname=_executable))):
                     shutil.rmtree(os.path.expanduser("~/.x2go/{progname}/".format(progname=_executable)))
@@ -383,7 +388,7 @@ VERSION: %s
                 lang = gettext.translation('PyHoca-GUI', localedir=basepath.locale_basepath, languages=['en'], )
             lang.install(str=True)
         else:
-            gettext.install('PyHoca-GUI', localedir=basepath.locale_basepath, str=True)
+            gettext.install('PyHoca-GUI', localedir=basepath.locale_basepath)
 
         if self.check_running():
             sys.stderr.write("\n###############################\n### %s: already running for user %s\n###############################\n" % (self.PROG_NAME, CURRENT_LOCAL_USER))
diff --git a/setup.py b/setup.py
index 1ca7b1e..1b72992 100755
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,8 @@ import os
 import platform
 import datetime
 
+from __future__ import print_function
+
 PROGRAM_NAME = 'PyHoca-GUI'
 # Windows:  UNINSTALL_NAME is for add/remove programs
 UNINSTALL_NAME = 'PyHoca-GUI (A graphical X2Go client)'

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