[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: f4ff086c8d81ca375bc2f96e60a85138544b9b6b
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:55:19 CEST 2013
The branch, twofactorauth has been updated
via f4ff086c8d81ca375bc2f96e60a85138544b9b6b (commit)
from 507bf248fb7777458f526ce11cd8e58f19ee4085 (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 | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index ba6f1d2..8298b2f 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -417,23 +417,27 @@ class X2goClient(object):
self.session_registry(session_uuid).terminated = True
terminate_session = __terminate_session
- def __get_session_profile(self, session_hash):
+ ###
+ ### Session profile oriented methods
+ ###
+
+ def __get_profile(self, session_uuid):
"""\
Retrieve the complete X2goSession object that has been
registry under the given sesion registry hash.
- @param session_hash: the X2go session's UUID registry hash
- @type session_hash: str
+ @param session_uuid: the X2go session's UUID registry hash
+ @type session_uuid: str
@return: the L{X2goSession} object
@rtype: obj
"""
return self.session_registry[session_hash]['profile']
- get_session_profile = __get_session_profile
- with_session_profile = __get_session_profile
+ get_profile = __get_profile
+ with_profile = __get_profile
- def __get_session_profile_name(self, session_uuid):
+ def __get_profile_name(self, session_uuid):
"""\
Retrieve the profile name of the session that has been registered
under C{session_hash}
@@ -447,9 +451,9 @@ class X2goClient(object):
"""
return self.session_registry(session_uuid).profile_name
- get_session_profile_name = __get_session_profile_name
+ get_profile_name = __get_profile_name
- def __get_session_profile_id(self, profile_name):
+ def __get_profile_id(self, profile_name):
"""\
Retrieve the session profile id of the session whose profile name
is C{profile_name}
@@ -462,7 +466,7 @@ class X2goClient(object):
"""
return self.session_registry(profile_name).profile_id
- get_session_profile_id = __get_session_profile_id
+ get_profile_id = __get_profile_id
###
### Provide access to config file class objects
@@ -475,6 +479,8 @@ class X2goClient(object):
"""
return self.session_profiles
get_session_profiles = __get_session_profiles
+ __get_profiles = __get_session_profiles
+ get_profiles = __get_profiles
def __get_client_settings(self):
"""\
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