[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 76ef55a968c001b62890acb37bad29cf203fe0bd

[X2Go dev team]

The branch, brokerclient has been updated
       via  76ef55a968c001b62890acb37bad29cf203fe0bd (commit)
      from  ccea5a21e55f92f599fd406a8f79ed3c367e56ff (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/terminal/_stdout.py |    6 ++++--
 x2go/session.py                   |   10 ++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 54ab518..fbbe331 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -235,7 +235,6 @@ class X2goTerminalSessionSTDOUT(object):
                  printing_backend=_X2goClientPrinting,
                  client_rootdir=os.path.join(_LOCAL_HOME, _X2GO_CLIENT_ROOTDIR),
                  sessions_rootdir=os.path.join(_LOCAL_HOME, _X2GO_SESSIONS_ROOTDIR),
-                 client_instance=None,
                  session_instance=None,
                  logger=None, loglevel=log.loglevel_DEFAULT):
         """\
@@ -296,7 +295,10 @@ class X2goTerminalSessionSTDOUT(object):
         self.print_action_args = print_action_args
         self.printing_backend = printing_backend
         self.session_instance = session_instance
-        self.client_instance = client_instance
+        if self.session_instance:
+            self.client_instance = self.session_instance.client_instance
+        else:
+            self.client_instance = None
 
         self._mk_sessions_rootdir(self.params.rootdir)
 
diff --git a/x2go/session.py b/x2go/session.py
index c1a896e..158fc6a 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -64,7 +64,6 @@ _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack',
                         'proxy_class', 'logger',
                         'control_backend', 'terminal_backend', 'proxy_backend',
                         'profiles_backend', 'settings_backend', 'printing_backend',
-                        'client_instance', 
                        )
 _X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_user', 'sshproxy_password',
                          'sshproxy_key_filename', 'sshproxy_tunnel',
@@ -98,6 +97,7 @@ class X2goSession(object):
                  keep_controlsession_alive=False,
                  logger=None, loglevel=log.loglevel_DEFAULT,
                  virgin=True, running=None, suspended=None, terminated=None,
+                 client_instance=None,
                  **params):
 
         if logger is None:
@@ -150,12 +150,6 @@ class X2goSession(object):
         self.ssh_rootdir = ssh_rootdir
         self.control_session = control_session
 
-        # the client instance is not deeply copiable
-        _client_instance=None
-        if params.has_key('client_instance'):
-            _client_instance = params['client_instance']
-            del params['client_instance']
-
         self.control_params = {}
         self.terminal_params = {}
         self.sshproxy_params = {}
@@ -164,7 +158,7 @@ class X2goSession(object):
         try: del self.control_params['server']
         except: pass
 
-        self.terminal_params['client_instance'] = _client_instance
+        self.client_instance = client_instance
 
         if self.logger.get_loglevel() & log.loglevel_DEBUG:
             self.logger('X2go control session parameters for profile %s:' % profile_name, loglevel=log.loglevel_DEBUG)


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).