[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.1.0-2-ga30ff31

[X2Go dev team]

The branch, master has been updated
       via  a30ff312cbb337dec2cb03f248d2e347910ad688 (commit)
      from  b47b28ff3c27d2dc75a5c18281867c2119790cc0 (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 -----------------------------------------------------------------
commit a30ff312cbb337dec2cb03f248d2e347910ad688
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 16 00:16:26 2012 +0100

    Make sure that internal calls to _X2goClient__list_sessions are not overridden by other method definitions in classes that inherit from X2goClient class. (Closes: #89).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    4 +++-
 x2go/client.py   |   28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 55b7597..1b366e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 python-x2go (0.2.1.1-0~x2go1) UNRELEASED; urgency=low
 
   * New upstream version (0.2.1.1):
-    - Continue development...
+    - Make sure that internal calls to _X2goClient__list_sessions are not
+      overridden by other method definitions in classes that inherit from
+      X2goClient class. (Closes: #89).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 13 Dec 2012 13:32:30 +0100
 
diff --git a/x2go/client.py b/x2go/client.py
index c1e5358..0e37573 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1529,9 +1529,9 @@ class X2goClient(object):
                 raise x2go_exceptions.X2goClientException('don\'t know which session to resume')
             if session_uuid is None:
                 session_uuid = self.session_registry.get_session_of_session_name(session_name=session_name, return_object=False)
-                return self.session_registry(session_uuid).resume(session_list=self.list_sessions(session_uuid=session_uuid), **sessionopts)
+                return self.session_registry(session_uuid).resume(session_list=self._X2goClient__list_sessions(session_uuid=session_uuid), **sessionopts)
             else:
-                return self.session_registry(session_uuid).resume(session_name=session_name, session_list=self.list_sessions(session_uuid=session_uuid), **sessionopts)
+                return self.session_registry(session_uuid).resume(session_name=session_name, session_list=self._X2goClient__list_sessions(session_uuid=session_uuid), **sessionopts)
         except x2go_exceptions.X2goControlSessionException:
             profile_name = self.get_session_profile_name(session_uuid)
             self.HOOK_on_control_session_death(profile_name)
@@ -2459,9 +2459,9 @@ class X2goClient(object):
         session.clean_sessions(destroy_terminals=_destroy_terminals, published_applications=published_applications)
     __clean_sessions = clean_sessions
 
-    def list_sessions(self, session_uuid=None, 
-                      profile_name=None, profile_id=None, 
-                      no_cache=False, refresh_cache=False, 
+    def list_sessions(self, session_uuid=None,
+                      profile_name=None, profile_id=None,
+                      no_cache=False, refresh_cache=False,
                       update_sessionregistry=True,
                       register_sessions=False,
                       raw=False):
@@ -2873,10 +2873,10 @@ class X2goClient(object):
         session_uuids = self.client_registered_sessions_of_profile_name(profile_name, return_objects=False)
         if session_uuids:
             if session_list is None:
-                session_list = self.list_sessions(session_uuids[0],
-                                                  update_sessionregistry=False, 
-                                                  register_sessions=False,
-                                                 )
+                session_list = self._X2goClient__list_sessions(session_uuids[0],
+                                                               update_sessionregistry=False,
+                                                               register_sessions=False,
+                                                              )
             try:
                 self.session_registry.update_status(profile_name=profile_name, session_list=session_list)
             except x2go_exceptions.X2goControlSessionException:
@@ -2893,7 +2893,7 @@ class X2goClient(object):
         @type session_uuid: C{str}
 
         """
-        session_list = self.list_sessions(session_uuid, update_sessionregistry=False, register_sessions=False)
+        session_list = self._X2goClient__list_sessions(session_uuid, update_sessionregistry=False, register_sessions=False)
         if session_list:
             self.session_registry.update_status(session_uuid=session_uuid, session_list=session_list)
     __update_sessionregistry_status_by_session_uuid = update_sessionregistry_status_by_session_uuid
@@ -3013,10 +3013,10 @@ class X2goClient(object):
         """
         if profile_name not in self.client_connected_profiles(return_profile_names=True):
             return
-        session_list = self.list_sessions(profile_name=profile_name, 
-                                          update_sessionregistry=False,
-                                          register_sessions=False,
-                                         )
+        session_list = self._X2goClient__list_sessions(profile_name=profile_name,
+                                                       update_sessionregistry=False,
+                                                       register_sessions=False,
+                                                      )
         try:
             self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register, skip_pubapp_sessions=skip_pubapp_sessions)
         except x2go_exceptions.X2goControlSessionException, e:


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