This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 300b150939b675aa418db5c3fdf8cd0c1d5314b6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 22 18:27:30 2017 +0200 Obviously, gevent from Python3 is quite critical towards circular import models. --- x2go/__init__.py | 2 +- x2go/checkhosts.py | 1 - x2go/cleanup.py | 3 +-- x2go/session.py | 5 ++--- x2go/xserver.py | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/x2go/__init__.py b/x2go/__init__.py index 6ecbbbd..4672679 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -196,7 +196,7 @@ if X2GOCLIENT_OS != 'Windows': from gevent import monkey monkey.patch_all() -import .utils +from . import utils from .client import X2GoClient from .backends.profiles.file import X2GoSessionProfiles diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index 0c8d94a..b118279 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -28,7 +28,6 @@ import paramiko import binascii # Python X2Go modules -from . import sshproxy from . import log from . import x2go_exceptions import random diff --git a/x2go/cleanup.py b/x2go/cleanup.py index 43c1b81..9f52a8d 100644 --- a/x2go/cleanup.py +++ b/x2go/cleanup.py @@ -27,7 +27,6 @@ import paramiko import threading # Python X2Go modules -from . import guardian from . import rforward from .defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS @@ -96,7 +95,7 @@ def x2go_cleanup(e=None, threads=None): del t for t in threads: - if type(t) == guardian.X2GoSessionGuardian: + if type(t) == X2GoSessionGuardian: t.stop_thread() del t diff --git a/x2go/session.py b/x2go/session.py index c858fc9..08541a6 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -68,7 +68,6 @@ import paramiko from . import defaults from . import log from . import utils -from . import session from . import x2go_exceptions from .defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS @@ -822,10 +821,10 @@ class X2GoSession(object): _control_params = copy.deepcopy(params) _sshproxy_params = copy.deepcopy(params) for p in list(params.keys()): - if p in session._X2GO_TERMINAL_PARAMS: + if p in _X2GO_TERMINAL_PARAMS: del _control_params[p] del _sshproxy_params[p] - elif p in session._X2GO_SSHPROXY_PARAMS: + elif p in _X2GO_SSHPROXY_PARAMS: del _control_params[p] del _terminal_params[p] else: diff --git a/x2go/xserver.py b/x2go/xserver.py index f91c93f..352c0bc 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -37,7 +37,7 @@ import gevent import copy # Python X2Go modules -from . import log +from .import log from .defaults import X2GO_XCONFIG_CONFIGFILES as _X2GO_XCONFIG_CONFIGFILES from .defaults import X2GO_CLIENTXCONFIG_DEFAULTS as _X2GO_CLIENTXCONFIG_DEFAULTS from . import inifiles -- Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git