This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from ab93199 python-x2go.spec: No need to run 2to3 at build time anymore. Python X2Go now natively supports Python2 and Python3. new c13c03a x2go/backends/control/plain.py: Drop debug print output. new 14e42ae x2go/backends/control/plain.p: Fix passphrase unlocking of private keys. new d06810e x2go/tests/runalltests.py: Fix runalltests.py (permissions, header). new e12cc7c debian/control: Add D (python*-x2go): python*-future. new 1762b36 python-x2go.spec: Add B-R python*-future. new abdf531 python-x2go.spec: Move python*-foo dependencies to %package sections. Add python*-future as a runtime requirement. new 57114f0 x2go/backends/control/plain.py: Handle password based authentication failures graceful. Uncomment previously commented out code. new 1623d96 x2go/backends/control/plain.py: Resolve Python 2 vs. 3 type issue on returned data from SSHClient.exec_command(). new b4eb88b x2go/cleanup.py: As we need to avoid circular imports, figure out with a work-around if to-be-stopped thread is of X2GoGuardianSession type or other. new 9187855 x2go/backends/profiles/httpbroker.py: Fix broker URL assembling when no port is given (i.e. convert None to '' manually). new d5f3e2b debian/rules: Temporarily disable API documentation builds. Switching to Sphinx is probably the way to go. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 2 ++ debian/rules | 10 ++++---- python-x2go.spec | 19 +++++++++++---- x2go/backends/control/plain.py | 45 ++++++++++++++---------------------- x2go/backends/profiles/httpbroker.py | 2 ++ x2go/cleanup.py | 4 +++- x2go/tests/runalltests.py | 3 --- 7 files changed, 43 insertions(+), 42 deletions(-) mode change 100644 => 100755 x2go/tests/runalltests.py -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 1762b36aa71e5721a886e0886e4409fd46587e4b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:24:55 2017 +0200 python-x2go.spec: Add B-R python*-future. --- python-x2go.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-x2go.spec b/python-x2go.spec index c576e0b..5b870ac 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -23,9 +23,11 @@ BuildRequires: fdupes %else BuildRequires: python2-devel %endif +BuildRequires: python-future BuildRequires: python-setuptools %if 0%{?with_python3} BuildRequires: python3-devel +BuildRequires: python3-future %endif # if with_python3 # For doc build BuildRequires: epydoc -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit c13c03a56422c4a37bed452170dcc3e935d74219 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 11:30:42 2017 +0200 x2go/backends/control/plain.py: Drop debug print output. --- x2go/backends/control/plain.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index b788cb3..2fc4b1d 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -546,8 +546,6 @@ class X2GoControlSession(paramiko.SSHClient): for line in raw_stdout.split('\n'): - print (type(line)) - if line.startswith('X2GODATABEGIN:'+cmd_uuid): is_x2go_data = True continue -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 14e42ae0492942ad02df656c7bf7df7de4f4d2d3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:22:36 2017 +0200 x2go/backends/control/plain.p: Fix passphrase unlocking of private keys. --- x2go/backends/control/plain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 2fc4b1d..c2331e9 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -1013,12 +1013,12 @@ class X2GoControlSession(paramiko.SSHClient): look_for_keys=False) elif (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey: self.logger('trying SSH pub/priv key authentication with server', loglevel=log.loglevel_DEBUG) - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey, + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=pkey, password=passphrase, key_filename=key_filename, timeout=timeout, allow_agent=False, look_for_keys=False) else: self.logger('trying SSH key discovery or agent authentication with server', loglevel=log.loglevel_DEBUG) - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, pkey=None, password=passphrase, key_filename=None, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit d06810eb45e9198b14d1a89bb57064db820cd9fb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:23:08 2017 +0200 x2go/tests/runalltests.py: Fix runalltests.py (permissions, header). --- x2go/tests/runalltests.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/x2go/tests/runalltests.py b/x2go/tests/runalltests.py old mode 100644 new mode 100755 index 02edfc8..d495701 --- a/x2go/tests/runalltests.py +++ b/x2go/tests/runalltests.py @@ -22,9 +22,6 @@ This file is a default test runner as found in ZOPE/Plone products. It works fine for any kind of Python unit testing---as we do here for Python X2Go. """ -__package__ = 'x2go.tests' -__name__ = 'x2go.tests.runalltests' - import os import sys -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit e12cc7c390a9bc5991eda6a9fb02a6ee34c8a985 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:23:39 2017 +0200 debian/control: Add D (python*-x2go): python*-future. --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 529cae2..d0bb36c 100644 --- a/debian/control +++ b/debian/control @@ -34,6 +34,7 @@ Depends: python-requests, python-simplejson, python-xlib, + python-future, nxproxy | qvd-nxproxy, sshfs, Recommends: @@ -66,6 +67,7 @@ Depends: python3-requests, python3-simplejson, python3-xlib, + python3-future, nxproxy | qvd-nxproxy, sshfs, Recommends: -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit abdf53158ffcadad1765b98ee30fc194888503fd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:29:16 2017 +0200 python-x2go.spec: Move python*-foo dependencies to %package sections. Add python*-future as a runtime requirement. --- python-x2go.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/python-x2go.spec b/python-x2go.spec index 5b870ac..6b08de8 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -37,11 +37,6 @@ BuildRequires: python-xlib BuildRequires: python-requests BuildRequires: python-simplejson Requires: nxproxy -Requires: python-gevent -Requires: python-paramiko >= 1.15.1 -Requires: python-xlib -Requires: python-requests -Requires: python-simplejson %description X2Go is a server based computing environment with: @@ -60,6 +55,12 @@ Python applications by providing a Python-based X2Go client API. Summary: Python X2Go client API documentation Group: Documentation Requires: %{name} = %{version}-%{release} +Requires: python-gevent +Requires: python-paramiko >= 1.15.1 +Requires: python-xlib +Requires: python-requests +Requires: python-simplejson +Requires: python-future %description doc This package contains the Python X2Go client API documentation. @@ -69,6 +70,12 @@ This package contains the Python X2Go client API documentation. %package -n python3-x2go Summary: Python module providing X2Go client API Group: Development/Languages +Requires: python3-gevent +Requires: python3-paramiko >= 1.15.1 +Requires: python3-xlib +Requires: python3-requests +Requires: python3-simplejson +Requires: python3-future %description -n python3-x2go X2Go is a server based computing environment with: -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 57114f014d6f8228589f5f54ba1058fba2295d68 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 19:56:10 2017 +0200 x2go/backends/control/plain.py: Handle password based authentication failures graceful. Uncomment previously commented out code. --- x2go/backends/control/plain.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index c2331e9..6d525c4 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -1114,19 +1114,14 @@ class X2GoControlSession(paramiko.SSHClient): if not password: password = "".join([random.choice(string.letters+string.digits) for x in range(1, 20)]) self.logger('performing SSH password authentication with server', loglevel=log.loglevel_DEBUG) - #try: - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, + try: + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, timeout=timeout, allow_agent=False, look_for_keys=False) - #except paramiko.AuthenticationException, e: - # self.close() - # if self.sshproxy_session: - # self.sshproxy_session.stop_thread() - # raise e - #except: - # self.close() - # if self.sshproxy_session: - # self.sshproxy_session.stop_thread() - # raise + except: + self.close() + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + raise self.set_missing_host_key_policy(paramiko.RejectPolicy()) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 1623d96f60d3754da009e745650e96b4f5cae4a0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 24 21:05:33 2017 +0200 x2go/backends/control/plain.py: Resolve Python 2 vs. 3 type issue on returned data from SSHClient.exec_command(). --- x2go/backends/control/plain.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 6d525c4..3091af9 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -32,6 +32,7 @@ __name__ = 'x2go.backends.control.plain' # modules import os +import sys import types import paramiko import gevent @@ -535,17 +536,17 @@ class X2GoControlSession(paramiko.SSHClient): (_stdin, _stdout, _stderr) = _retval raw_stdout = _stdout.read() - sanitized_stdout = '' + sanitized_stdout = u'' is_x2go_data = False - # Python 3 needs a decoding from bytestring to (unicode) string - try: + # Python 3 needs a decoding from bytestring to string + if sys.version_info[0] >= 3: raw_stdout = raw_stdout.decode() - except: - pass + else: + if type(raw_stdout) is not types.UnicodeType: + raw_stdout = raw_stdout.decode('utf-8') for line in raw_stdout.split('\n'): - if line.startswith('X2GODATABEGIN:'+cmd_uuid): is_x2go_data = True continue @@ -553,12 +554,7 @@ class X2GoControlSession(paramiko.SSHClient): if line.startswith('X2GODATAEND:'+cmd_uuid): break sanitized_stdout += line + "\n" - try: - # Python 3: - _stdout_new = io.StringIO(sanitized_stdout) - except TypeError: - # Python 2: - _stdout_new = io.StringIO(sanitized_stdout.decode()) + _stdout_new = io.StringIO(sanitized_stdout) _retval = (_stdin, _stdout_new, _stderr) return _retval -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit b4eb88b303e1c5b4fe3d8bf3c2fdf67ecf6cb43d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 25 12:41:54 2017 +0200 x2go/cleanup.py: As we need to avoid circular imports, figure out with a work-around if to-be-stopped thread is of X2GoGuardianSession type or other. --- x2go/cleanup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x2go/cleanup.py b/x2go/cleanup.py index f3f222d..b1d95b6 100644 --- a/x2go/cleanup.py +++ b/x2go/cleanup.py @@ -98,7 +98,9 @@ def x2go_cleanup(e=None, threads=None): del t for t in threads: - if type(t) == X2GoSessionGuardian: + # now let's catch X2GoSessionGuardian, which is a bit tricky + # as we need to avoid circular imports + if hasattr(t, 'stop_thread') and hasattr(t, 'guardian'): t.stop_thread() del t -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 9187855cb36fd3913378c9797c32c640727a750f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 25 12:43:12 2017 +0200 x2go/backends/profiles/httpbroker.py: Fix broker URL assembling when no port is given (i.e. convert None to '' manually). --- x2go/backends/profiles/httpbroker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2go/backends/profiles/httpbroker.py b/x2go/backends/profiles/httpbroker.py index 224f427..f9a1cc7 100644 --- a/x2go/backends/profiles/httpbroker.py +++ b/x2go/backends/profiles/httpbroker.py @@ -94,6 +94,8 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles): p['path'] = "/{path}".format(**p) if p['port'] is not None: p['port'] = ":{port}".format(**p) + else: + p['port'] = '' self.broker_url = "{protocol}://{hostname}{port}{path}".format(**p) -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit d5f3e2b7716d998bc0819fe9567bf46b3cc3425f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 25 12:44:32 2017 +0200 debian/rules: Temporarily disable API documentation builds. Switching to Sphinx is probably the way to go. --- debian/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index 53eaf72..d65a2b0 100755 --- a/debian/rules +++ b/debian/rules @@ -6,11 +6,11 @@ include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/rules/debhelper.mk -configure/python-x2go-doc:: - if [ ! -d .epydoc/html ]; then \ - mkdir -p .epydoc/html; \ - epydoc --debug -n "Python X2Go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/; \ - fi +#configure/python-x2go-doc:: +# if [ ! -d .epydoc/html ]; then \ +# mkdir -p .epydoc/html; \ +# epydoc --debug -n "Python X2Go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/; \ +# fi cleanbuilddir/python-x2go-doc:: rm -Rf .epydoc/html -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org