[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: ae260e32c971d9d1e9425f0b20500e4ddbbaa127

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:55:21 CEST 2013


The branch, twofactorauth has been updated
       via  ae260e32c971d9d1e9425f0b20500e4ddbbaa127 (commit)
      from  cce7282b44ed4a63885eb3f780224a48e5a5f2e2 (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/profiles.py |    2 +-
 x2go/registry.py |   26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/profiles.py b/x2go/profiles.py
index 00ae796..e190921 100644
--- a/x2go/profiles.py
+++ b/x2go/profiles.py
@@ -223,4 +223,4 @@ class X2goSessionProfiles(inifiles.X2goIniFile):
         STILL UNDOCUMENTED
 
         """
-        return self.to_session_params(profile_id_or_name)[param]
\ No newline at end of file
+        return self.to_session_params(profile_id_or_name)[param]
diff --git a/x2go/registry.py b/x2go/registry.py
index 85216eb..74bf195 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -38,6 +38,11 @@ class X2goRegisteredSession(object):
 
     def __init__(self):
         self.uuid = uuid.uuid1()
+        self.connected = False
+        self.running = False
+        self.suspended = False
+        self.terminated = False
+        
     def __str__(self):
         return self.__get_uuid()
     def __repr__(self):
@@ -459,7 +464,15 @@ class X2goSessionRegistry(object):
         STILL UNDOCUMENTED
 
         """
-        return len(self.running_sessions) > 0
+        return self.running_sessions and len(self.running_sessions) > 0
+
+    @property
+    def has_suspended_session(self):
+        """\
+        STILL UNDOCUMENTED
+
+        """
+        return self.suspended_sessions and len(self.suspended_sessions) > 0
 
     @property
     def registered_sessions(self):
@@ -477,16 +490,23 @@ class X2goSessionRegistry(object):
         """
         return [ s for s in self.registry.values() if s not in self.running_sessions ]
 
+    def registered_sessions_of_name(self, profile_name):
+        """\
+        STILL UNDOCUMENTED
+
+        """
+        return self.registered_sessions and [ s for s in self.registered_sessions if s.profile_name == profile_name ]
+
     def running_sessions_of_name(self, profile_name):
         """\
         STILL UNDOCUMENTED
 
         """
-        return [ s for s in self.running_sessions if s.profile_name == profile_name ]
+        return self.running_sessions and [ s for s in self.running_sessions if s.profile_name == profile_name ]
 
     def suspended_sessions_of_name(self, profile_name):
         """\
         STILL UNDOCUMENTED
 
         """
-        return [ s for s in self.running_sessions if s.profile_name == profile_name ]
+        return self.running_sessions and [ s for s in self.running_sessions if s.profile_name == profile_name ]


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