This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit bd2d333b090368fcff64910b563b27d166ecacb5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Aug 31 15:22:28 2017 +0200 x2go/session.py: Drop duplicated method is_locked(). --- debian/changelog | 1 + x2go/session.py | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb56494..3bf0232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-x2go (0.5.0.6-0x2go1) UNRELEASED; urgency=medium [ Mike Gabriel ] * x2go/defaults.py: Support LXQt sessions by default. * x2go/session.py: Only release locks if actually locked. + * x2go/session.py: Drop duplicated method is_locked(). -- X2Go Release Manager <git-admin@x2go.org> Mon, 15 May 2017 20:01:59 +0200 diff --git a/x2go/session.py b/x2go/session.py index f36ceea..0500470 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -269,8 +269,6 @@ class X2GoSession(object): self._last_status = None - self.locked = False - self.auto_start_or_resume = auto_start_or_resume self.auto_connect = auto_connect self.printing = printing @@ -2868,20 +2866,6 @@ class X2GoSession(object): return [ unicode(sf) for sf in self.shared_folders if self.shared_folders[sf]['status'] in ('new', 'mounted') ] __get_shared_folders = get_shared_folders - def is_locked(self): - """\ - Query session if it is locked by some command being processed. - - @return: returns C{True} is the session is locked, C{False} if not; returns C{None}, if there is no - control session yet. - @rtype: C{bool} - - """ - if self.control_session is not None: - return self.control_session.locked or self.locked - return None - __is_locked = is_locked - def session_cleanup(self): """\ Clean up X2Go session. -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git