[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-268-g7e7017e
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:27:06 CET 2014
The branch, build-baikal has been updated
via 7e7017e56461e92c14b3f61abc716eb8de66644d (commit)
from b3923e7acb5064a1f54c44c4a44aef26d4526274 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2go/backends/control/_stdout.py | 4 ++--
x2go/backends/proxy/_nx3.py | 1 -
x2go/forward.py | 1 -
x2go/utils.py | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 2c18b70..169f82c 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -1112,8 +1112,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@rtype: C{bool}
"""
- if session_name in kwargs.keys():
- del kwargs[session_name]
+ if 'session_name' in kwargs.keys():
+ del kwargs['session_name']
return self.resume(**kwargs)
def resume(self, session_name=None, session_instance=None, session_list=None, **kwargs):
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index ae22e84..22ba3ef 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -27,7 +27,6 @@ __NAME__ = 'x2goproxynx3-pylib'
import os
# Python X2Go modules
-import x2go.utils as utils
import x2go.log as log
import base
diff --git a/x2go/forward.py b/x2go/forward.py
index b382bee..5cb2c00 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -35,7 +35,6 @@ from gevent.server import StreamServer
# Python X2Go modules
import log
from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
-import x2go_exceptions
class X2goFwServer(StreamServer):
"""\
diff --git a/x2go/utils.py b/x2go/utils.py
index 029b94e..bae73a1 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -225,7 +225,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
del _params[opt]
opt = _rename_dict[opt]
if opt in _known_options:
- _type = _type(_known_options[opt])
+ _type = type(_known_options[opt])
_params[opt] = _type(val)
else:
_params[opt] = val
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list