This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit b4eb88b303e1c5b4fe3d8bf3c2fdf67ecf6cb43d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 25 12:41:54 2017 +0200 x2go/cleanup.py: As we need to avoid circular imports, figure out with a work-around if to-be-stopped thread is of X2GoGuardianSession type or other. --- x2go/cleanup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x2go/cleanup.py b/x2go/cleanup.py index f3f222d..b1d95b6 100644 --- a/x2go/cleanup.py +++ b/x2go/cleanup.py @@ -98,7 +98,9 @@ def x2go_cleanup(e=None, threads=None): del t for t in threads: - if type(t) == X2GoSessionGuardian: + # now let's catch X2GoSessionGuardian, which is a bit tricky + # as we need to avoid circular imports + if hasattr(t, 'stop_thread') and hasattr(t, 'guardian'): t.stop_thread() del t -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git