[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.0.44.2-32-g605a0d3

[X2Go dev team]

The branch, brokerclient has been updated
       via  605a0d35cf46b1db9b32fb6786f5418744153da9 (commit)
      from  2e0232b4b3d86428f40ffa9baec29624422fd690 (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/client.py |   34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index 7b80471..c886ecc 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1508,7 +1508,6 @@ class X2goClient(object):
         return self.session_registry.has_suspended_sessions
     __client_has_suspended_sessions = client_has_suspended_sessions
 
-    @property
     def client_registered_sessions(self, return_objects=True, return_profile_names=False, return_profile_ids=False, return_session_names=False):
         """\
         Retrieve a list of registered X2go sessions.
@@ -1531,10 +1530,7 @@ class X2goClient(object):
     @property
     def client_control_sessions(self):
         """\
-        Retrieve a list of all registered X2go control sessions.
-
-        @return: list of all registered control sessions
-        @rtype: C{list}
+        Equals a list of all registered X2go control sessions.
 
         """
         return self.session_registry.control_sessions
@@ -1621,6 +1617,7 @@ class X2goClient(object):
         @type return_session_names: C{bool}
         @return: list of associated sessions of profile name
         @rtype: C{list}
+
         """
         return self.session_registry.associated_sessions_of_profile_name(profile_name, return_objects=return_objects, return_session_names=return_session_names)
     __client_associated_sessions_of_profile_name = client_associated_sessions_of_profile_name
@@ -1637,6 +1634,7 @@ class X2goClient(object):
         @type session_uuid: C{str}
         @return: C{True} if X2go server connection for L{X2goSession} instance with <session_uuid> is alive.
         @rtype: C{bool}
+
         """
         try:
             return self.session_registry(session_uuid).is_alive()
@@ -1653,6 +1651,7 @@ class X2goClient(object):
 
         @return: C{True} if all connected X2go servers are alive.
         @rtype: C{bool}
+
         """
         _all_alive = True
         for session_uuid in self.client_connected_sessions():
@@ -1692,19 +1691,19 @@ class X2goClient(object):
             raise x2go_exceptions.X2goClientException('X2go session with UUID %s is not connected' % session_uuid)
     __server_running_sessions = server_running_sessions
 
-    @property
     def server_has_running_sessions(self, session_uuid):
         """\
         Equals C{True} if the X2go server has any running sessions.
 
         @param session_uuid: the X2go session's UUID registry hash
         @type session_uuid: C{str}
+        @return: C{True}, if there are running sessions
+        @rtype: C{bool}
 
         """
         return len(self._X2goClient__server_running_sessions(session_uuid)) > 0
     __server_has_running_sessions = server_has_running_sessions
 
-    @property
     def server_has_running_session_of_name(self, session_uuid, session_name):
         """\
         Equals C{True} if the X2go server has a running session of name <session_name>.
@@ -1735,7 +1734,6 @@ class X2goClient(object):
             raise x2go_exceptions.X2goClientException('X2go session with UUID %s is not connected' % session_uuid)
     __server_suspended_sessions = server_suspended_sessions
 
-    @property
     def server_has_suspended_sessions(self, session_uuid):
         """\
         Equals C{True} if the X2go server has any suspended sessions.
@@ -1746,7 +1744,6 @@ class X2goClient(object):
         """
         return len(self._X2goClient__server_suspended_sessions(session_uuid)) > 0
 
-    @property
     def server_has_suspended_session_of_name(self, session_uuid, session_name):
         """\
         Equals C{True} if the X2go server has a suspended session of name <session_name>.
@@ -1755,6 +1752,8 @@ class X2goClient(object):
         @type session_uuid: C{str}
         @param session_name: session name
         @type session_name: C{str}
+        @return: C{True}, if there are running sessions
+        @rtype: C{bool}
 
         """
         return session_name in self._X2goClient__server_suspended_sessions(session_uuid)
@@ -1867,12 +1866,15 @@ class X2goClient(object):
 
     def get_profiles(self):
         """\
-        Returns the L{X2goClient} instance's L{X2goSessionProfiles} object.
+        Returns the L{X2goClient} instance's C{X2goSessionProfiles*} object.
 
         Use this method for object retrieval if you want to modify the »sessions«
         configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
         Python X2go based application.
 
+        return: returns the client's session profiles instance
+        rtype: C{X2goSessionProfiles*} instance
+
         """
         return self.session_profiles
     __get_profiles = get_profiles
@@ -1890,24 +1892,30 @@ class X2goClient(object):
 
     def get_client_settings(self):
         """\
-        Returns the L{X2goClient} instance's L{X2goClientSettings} object.
+        Returns the L{X2goClient} instance's C{X2goClientSettings*} object.
 
         Use this method for object retrieval if you want to modify the »settings«
         configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
         Python X2go based application.
 
+        return: returns the client's settings configuration node
+        rtype: C{bool}
+
         """
         return self.client_settings
     __get_client_settings = get_client_settings
 
     def get_client_printing(self):
         """\
-        Returns the L{X2goClient} instance's L{X2goClientPrinting} object.
+        Returns the L{X2goClient} instance's C{X2goClientPrinting*} object.
 
         Use this method for object retrieval if you want to modify the printing
         configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
         Python X2go based application.
 
+        return: returns the client's printing configuration node
+        rtype: C{bool}
+
         """
         return self.client_printing
     __get_client_printing = get_client_printing
@@ -2020,7 +2028,7 @@ class X2goClient(object):
         @param profile_name: the X2go session profile name
         @type profile_name: C{str}
         @param session_list: a manually passed on list of X2go sessions
-        @type profile_name: C{X2goServerInfo*} instances
+        @type session_list: C{X2goServerList*} instances
 
         """
         session_uuids = self.client_registered_sessions_of_profile_name(profile_name, return_objects=False)


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