x2go-commits

x2go-commits@lists.x2go.org

1 participants
37901 discussions

[x2goclient] 28/94: debian/changelog: Update from Git history
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit b851c91bb654a803043ac6f69c648376066f4bf8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 25 12:50:45 2017 +0200 debian/changelog: Update from Git history --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index ba56cfd4..51aa0ad2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,15 @@ pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium * Port to Python3. + * Bump upstream version to 0.5.99.0. + * debian/rules: + + Build for Python3, not Python2. + * debian/control: + + Fix src:pkg header part. + + Switch to python3-* dependencies. + + White-space fix. + + Bump versioned D (pyhoca-cli): python-x2go (>= 0.5.99.0~). + * debian/{control,compat}: Bump to DH version level 9. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Sep 2017 14:09:18 +0200 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 30/94: debian/rules: Typo fix in WITH_PYTHON3 variable assignment.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 957fb1a0bfe11ba9e79273c76ab407e7b005a871 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 25 13:49:05 2017 +0200 debian/rules: Typo fix in WITH_PYTHON3 variable assignment. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 30a7635e..3f273214 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2016 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -WITH_PYTHON3 = $(shell test -f /usr/bin/dh_python2 && echo "--with python3") +WITH_PYTHON3 = $(shell test -f /usr/bin/dh_python3 && echo "--with python3") %: dh ${@} ${WITH_PYTHON3} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 29/94: pyhoca-cli.spec: Adapt to PyHoca-CLI's Python3 port.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit b427400d1ec9a0e5de1cbb721bfa3aaf7c726446 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 25 12:52:50 2017 +0200 pyhoca-cli.spec: Adapt to PyHoca-CLI's Python3 port. --- pyhoca-cli.spec | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index c87acb99..2d860936 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -1,5 +1,5 @@ Name: pyhoca-cli -Version: 0.5.0.5 +Version: 0.5.99.0 Release: 0.0x2go1%{?dist} Summary: Command line X2Go client written in Python @@ -13,23 +13,16 @@ URL: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch +BuildRequires: python3-devel %if 0%{?suse_version} -BuildRequires: python-devel BuildRequires: fdupes -%else -BuildRequires: python2-devel %endif -BuildRequires: python-setuptools -Requires: python-setproctitle -Requires: python-x2go >= 0.5.0.0 -Requires: python-argparse +BuildRequires: python3-setuptools +Requires: python3-setproctitle +Requires: python3-x2go >= 0.5.99.0 +Requires: python3-argparse -%if 0%{?el5} -# For compatibility with EPEL5 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -%else BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif %description X2Go is a server based computing environment with: @@ -51,11 +44,11 @@ on desktops and thin clients. %build -%{__python} setup.py build +%{__python3} setup.py build %install -%{__python} setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot} +%{__python3} setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot} mkdir -p %{buildroot}/%{_bindir}/ cp -p %{name} %{buildroot}/%{_bindir}/ mkdir -p %{buildroot}/%{_mandir}/ @@ -69,7 +62,7 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %defattr(-,root,root) %doc COPYING README TODO %{_bindir}/%{name} -%{python_sitelib}/* +%{python3_sitelib}/* %{_mandir}/man1/%{name}.1* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 27/94: Bump upstream version to 0.5.99.0.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit adba56236911e58c02eb90fa3c4e38b295247bae Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 22 14:13:52 2017 +0200 Bump upstream version to 0.5.99.0. --- debian/changelog | 6 +++--- debian/control | 2 +- pyhoca/cli/__init__.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d43ebd4..ba56cfd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -pyhoca-cli (0.5.0.5-0x2go1) UNRELEASED; urgency=medium +pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium - * Continue development + * Port to Python3. - -- X2Go Release Manager <git-admin(a)x2go.org> Sun, 24 Sep 2017 10:48:27 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Sep 2017 14:09:18 +0200 pyhoca-cli (0.5.0.4-0x2go1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 402077d8..29db8833 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, python3, - python3-x2go (>=0.6.0.0-0~), + python3-x2go (>=0.5.99.0-0~), python3-argparse, python3-setproctitle, Suggests: diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index f03b6679..bebfe4aa 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.5.0.5" +__VERSION__ = "0.5.99.0" from .frontend import * -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 26/94: debian/rules: Build for Python3, not Python2.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 04eabd578c44beb3c7bce12ee7785df78848a877 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 22 14:12:47 2017 +0200 debian/rules: Build for Python3, not Python2. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index f4eeb162..30a7635e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,10 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2016 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") +WITH_PYTHON3 = $(shell test -f /usr/bin/dh_python2 && echo "--with python3") %: - dh ${@} ${WITH_PYTHON2} + dh ${@} ${WITH_PYTHON3} override_dh_auto_clean: rm -Rf PyHoca_CLI.egg-info/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 25/94: debian/control: Fix src:pkg header part.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit e344f92374d9e56cb1a20a9c1ffa9ab66d28d2f5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 22 14:12:24 2017 +0200 debian/control: Fix src:pkg header part. --- debian/control | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index b4ee12c4..402077d8 100644 --- a/debian/control +++ b/debian/control @@ -10,17 +10,18 @@ Build-Depends: man2html-base | man2html, python3 (>=2.6.5-0~), python3-setuptools, - python3-support (>=0.90) | dh-python3 -Standards-Version: 3.9.6 + python3-support (>=0.90) | dh-python +Standards-Version: 4.1.0 Homepage: http://code.x2go.org/releases/source/pyhoca-cli Vcs-Git: git://code.x2go.org/pyhoca-cli.git Vcs-Browser: http://code.x2go.org/gitweb?p=pyhoca-cli.git;a=summary -X-Python-Version: >= 2.6 +X-Python3-Version: >= 3.6 Package: pyhoca-cli Architecture: all Depends: ${misc:Depends}, + ${python3:Depends}, python3, python3-x2go (>=0.6.0.0-0~), python3-argparse, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 22/94: debian/control: Bump versioned D (pyhoca-cli): python-x2go (>= 0.5.99.0).
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 13503d943728c45e20ad581342b306682754ac9e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 22 12:05:58 2017 +0200 debian/control: Bump versioned D (pyhoca-cli): python-x2go (>= 0.5.99.0). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index fd236656..19de075c 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.5.0.0-0~), + python-x2go (>=0.6.0.0-0~), python-argparse, python-setproctitle, Suggests: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 24/94: debian/control: Switch to python3-* dependencies.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit eb844a1fcf4661c2c3f35df2d7c46f6e0dc22ee4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 22 12:11:16 2017 +0200 debian/control: Switch to python3-* dependencies. --- debian/control | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 41989596..b4ee12c4 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Uploaders: Build-Depends: debhelper (>= 9), man2html-base | man2html, - python (>=2.6.5-0~), - python-setuptools, - python-support (>=0.90) | dh-python + python3 (>=2.6.5-0~), + python3-setuptools, + python3-support (>=0.90) | dh-python3 Standards-Version: 3.9.6 Homepage: http://code.x2go.org/releases/source/pyhoca-cli Vcs-Git: git://code.x2go.org/pyhoca-cli.git @@ -21,10 +21,10 @@ Package: pyhoca-cli Architecture: all Depends: ${misc:Depends}, - python, - python-x2go (>=0.6.0.0-0~), - python-argparse, - python-setproctitle, + python3, + python3-x2go (>=0.6.0.0-0~), + python3-argparse, + python3-setproctitle, Suggests: mteleplayer-clientside, Description: Command line X2Go client written in Python -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 23/94: debian/control: White-space fix.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 2d88f3dfd34c6390c18bce37cf3dc8ec4a4c09af Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 22 12:06:12 2017 +0200 debian/control: White-space fix. --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 19de075c..41989596 100644 --- a/debian/control +++ b/debian/control @@ -40,4 +40,3 @@ Description: Command line X2Go client written in Python PyHoca-CLI provides a simple and flexible command line client written in Python that allows you to control X2Go client sessions on desktops and thin clients. - -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 20/94: Port to Python3.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.0 in repository x2goclient. commit 568f71fa50fa579569a0b45cafcb95ecf56aef81 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 22 12:03:34 2017 +0200 Port to Python3. --- pyhoca-cli | 4 +- pyhoca/cli/__init__.py | 2 +- pyhoca/cli/frontend.py | 118 ++++++++++++++++++++++++------------------------- setup.py | 2 +- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 0bf8bba8..c5ac402f 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # Copyright (C) 2010-2016 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> @@ -424,6 +424,6 @@ if __name__ == '__main__': sys.exit(0) - except (KeyboardInterrupt, SystemExit), e: + except (KeyboardInterrupt, SystemExit) as e: x2go.x2go_cleanup(e) diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 253ec2b4..f03b6679 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -27,4 +27,4 @@ http://wiki.x2go.org """ __VERSION__ = "0.5.0.5" -from frontend import * +from .frontend import * diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index f7818349..ce0415ad 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -81,35 +81,35 @@ class PyHocaCLI(x2go.X2GoClient): """ # retrieve a session list - print - print "Available runing/suspended X2Go sessions" - print "========================================" + print() + print("Available runing/suspended X2Go sessions") + print("========================================") _peername = self._X2GoClient__get_session_server_peername(s_hash) - print "Host: %s - [%s]:%s" % (self._X2GoClient__get_session_server_hostname(s_hash), _peername[0], _peername[1]) - print "Username: %s" % self._X2GoClient__get_session_username(s_hash) - print + print("Host: %s - [%s]:%s" % (self._X2GoClient__get_session_server_hostname(s_hash), _peername[0], _peername[1])) + print("Username: %s" % self._X2GoClient__get_session_username(s_hash)) + print() session_infos = self._X2GoClient__list_sessions(s_hash) if session_infos: - for session_info in session_infos.values(): - print "Session Name: %s" % session_info - print "-------------" - print "cookie: %s" % session_info.cookie - print "agent PID: %s" % session_info.agent_pid - print "display: %s" % session_info.display - print "status: %s" % session_info.status - print "graphic port: %s" % session_info.graphics_port - print "snd port: %s" % session_info.snd_port - print "sshfs port: %s" % session_info.sshfs_port - print "username: %s" % session_info.username - print "hostname: %s" % session_info.hostname + for session_info in list(session_infos.values()): + print("Session Name: %s" % session_info) + print("-------------") + print("cookie: %s" % session_info.cookie) + print("agent PID: %s" % session_info.agent_pid) + print("display: %s" % session_info.display) + print("status: %s" % session_info.status) + print("graphic port: %s" % session_info.graphics_port) + print("snd port: %s" % session_info.snd_port) + print("sshfs port: %s" % session_info.sshfs_port) + print("username: %s" % session_info.username) + print("hostname: %s" % session_info.hostname) # TODO: turn into datetime object - print "create date: %s" % session_info.date_created + print("create date: %s" % session_info.date_created) # TODO: turn into datetime object - print "suspended since: %s" % session_info.date_suspended - print + print("suspended since: %s" % session_info.date_suspended) + print() else: - print "No running/suspended sessions found on X2Go server." - print + print("No running/suspended sessions found on X2Go server.") + print() def list_desktops(self, s_hash): """\ @@ -123,20 +123,20 @@ class PyHocaCLI(x2go.X2GoClient): """ # retrieve a desktop list - print - print "X2Go desktops available for sharing" - print "===================================" + print() + print("X2Go desktops available for sharing") + print("===================================") _peername = self._X2GoClient__get_session_server_peername(s_hash) - print "Host: %s - [%s]:%s" % (self._X2GoClient__get_session_server_hostname(s_hash), _peername[0], _peername[1]) - print "Username: %s" % self._X2GoClient__get_session_username(s_hash) - print + print("Host: %s - [%s]:%s" % (self._X2GoClient__get_session_server_hostname(s_hash), _peername[0], _peername[1])) + print("Username: %s" % self._X2GoClient__get_session_username(s_hash)) + print() desktop_list = self._X2GoClient__list_desktops(s_hash) if desktop_list: for desktop_name in desktop_list: - print desktop_name + print(desktop_name) else: - print "No X2Go desktop sessions found that are available for desktop sharing." - print + print("No X2Go desktop sessions found that are available for desktop sharing.") + print() def list_profiles(self): """\ @@ -146,16 +146,16 @@ class PyHocaCLI(x2go.X2GoClient): """ # retrieve a session list - print - print "Available X2Go session profiles" - print "===============================" + print() + print("Available X2Go session profiles") + print("===============================") _profiles = self._X2GoClient__get_profiles() for _profile_id in _profiles.profile_ids: _profile_config = _profiles.get_profile_config(_profile_id) _session_params = _profiles.to_session_params(_profile_id) - print _profile_config - print _session_params - print + print(_profile_config) + print(_session_params) + print() def clean_sessions(self, s_hash): """\ @@ -224,7 +224,7 @@ class PyHocaCLI(x2go.X2GoClient): self._auto_resume_oldest(s_hash) elif available_sessions and self.args.resume == 'NEWEST': self._auto_resume_newest(s_hash) - elif self.args.resume in available_sessions.keys(): + elif self.args.resume in list(available_sessions.keys()): self._X2GoClient__resume_session(s_hash, self.args.resume) else: self._runtime_error('requested session not available on X2Go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=20) @@ -243,7 +243,7 @@ class PyHocaCLI(x2go.X2GoClient): self.logger('sharing X2Go session: %s' % _desktop, loglevel=x2go.loglevel_INFO, ) try: self._X2GoClient__share_desktop_session(s_hash, desktop=_desktop, share_mode=_share_mode) - except x2go.X2GoDesktopSharingException, e: + except x2go.X2GoDesktopSharingException as e: self._runtime_error('%s' % str(e), exitcode=54) @@ -265,7 +265,7 @@ class PyHocaCLI(x2go.X2GoClient): _session_names = [ self.args.suspend ] for _session_name in _session_names: - if _session_name in available_sessions.keys(): + if _session_name in list(available_sessions.keys()): self._X2GoClient__suspend_session(s_hash, _session_name) self._pyhoca_logger("X2Go session %s has been suspended" % _session_name, loglevel=x2go.loglevel_NOTICE, ) else: @@ -294,7 +294,7 @@ class PyHocaCLI(x2go.X2GoClient): _session_names = [ self.args.terminate ] for _session_name in _session_names: - if _session_name in available_sessions.keys(): + if _session_name in list(available_sessions.keys()): self._X2GoClient__terminate_session(s_hash, _session_name) self._pyhoca_logger("X2Go session %s has been terminated" % _session_name, loglevel=x2go.loglevel_NOTICE, ) else: @@ -360,26 +360,26 @@ class PyHocaCLI(x2go.X2GoClient): _session_profiles = self._X2GoClient__get_profiles() # retrieve a session list - print - print "Available X2Go session profiles" - print "===============================" + print() + print("Available X2Go session profiles") + print("===============================") if hasattr(_session_profiles, 'config_files') and _session_profiles.config_files is not None: - print "configuration files: %s" % _session_profiles.config_files + print("configuration files: %s" % _session_profiles.config_files) if hasattr(_session_profiles, 'user_config_file') and _session_profiles.user_config_file is not None: - print "user configuration file: %s" % _session_profiles.user_config_file + print("user configuration file: %s" % _session_profiles.user_config_file) if hasattr(_session_profiles, 'broker_url') and _session_profiles.broker_url is not None: - print "X2Go Session Broker URL: %s" % _session_profiles.broker_url - print + print("X2Go Session Broker URL: %s" % _session_profiles.broker_url) + print() for _profile_id in _session_profiles.profile_ids: _profile_config = _session_profiles.get_profile_config(_profile_id) _session_params = _session_profiles.to_session_params(_profile_id) - print 'Profile ID: %s' % _profile_id - print 'Profile Name: %s' % _session_params['profile_name'] - print 'Profile Configuration:' + print('Profile ID: %s' % _profile_id) + print('Profile Name: %s' % _session_params['profile_name']) + print('Profile Configuration:') pprint.pprint(_profile_config) - print 'Derived session parameters:' + print('Derived session parameters:') pprint.pprint(_session_params) - print + print() # done sys.exit(0) @@ -455,16 +455,16 @@ class PyHocaCLI(x2go.X2GoClient): self._X2GoClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True force_password_auth = False - except x2go.PasswordRequiredException, e: + except x2go.PasswordRequiredException as e: self._pyhoca_logger('unlock SSH key file (%s)' % self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() - except x2go.AuthenticationException, e: + except x2go.AuthenticationException as e: force_password_auth = True self._pyhoca_logger('passwordless login for ,,%s\'\' failed' % _username, loglevel=x2go.loglevel_WARN, ) self._pyhoca_logger('proceeding to interactive login for user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, ) except x2go.BadHostKeyException: self._runtime_error('SSH host key verification for remote host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), exitcode=-254) - except x2go.SSHException, e: + except x2go.SSHException as e: if str(e) not in ('not a valid DSA private key file', 'Incompatible ssh peer (no acceptable kex algorithm)', 'No authentication methods available'): self._runtime_error(str(e), exitcode=253) force_password_auth = True @@ -491,7 +491,7 @@ class PyHocaCLI(x2go.X2GoClient): else: self._runtime_error('non-interactive authentication failed', exitcode=-203) - except socket.error, e: + except socket.error as e: self._runtime_error('a socket error occured while establishing the connection: %s' % str(e), exitcode=-245) def MainLoop(self): @@ -603,6 +603,6 @@ class PyHocaCLI(x2go.X2GoClient): time.sleep(2) self._pyhoca_logger("X2Go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, ) - except x2go.X2GoSessionException, e: + except x2go.X2GoSessionException as e: self._pyhoca_logger("X2GoSessionException occured:", loglevel=x2go.loglevel_ERROR) self._pyhoca_logger("-> %s" % str(e), loglevel=x2go.loglevel_ERROR) diff --git a/setup.py b/setup.py index 78cdb9da..03e52dca 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Copyright (C) 2010-2016 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits