[X2Go-Commits] [python-x2go] 01/01: On non-Windows platforms, enforce usage of the "ares" DNS resolver in python-gevent (which is available since Python gevent 1.0~). (Fixes: #588).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 54fddb28ef84601d710df4deb86ca0a8be66b2b6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 29 21:43:54 2014 +0200

    On non-Windows platforms, enforce usage of the "ares" DNS resolver in python-gevent (which is available since Python gevent 1.0~). (Fixes: #588).
---
 debian/changelog |    5 +++--
 x2go/__init__.py |    8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b742ed..4d91415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,8 +78,9 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low
       aware of handling multiple connects on the same tunnel.
     - Rename LICENSE.txt to COPYING.
     - Be more exact when detecting the NX proxy window id.
-    - Enforce usage of the "ares" DNS resolver in python-gevent (which is
-      available since Python gevent 1.0~). (Fixes: #588).
+    - On non-Windows platforms, enforce usage of the "ares" DNS resolver in
+      python-gevent (which is available since Python gevent 1.0~). (Fixes:
+      #588).
   * debian/control:
     + Add dependencies: python-requests, python-simplejson.
   * python-x2go.spec:
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 4d95f45..5ad66b0 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -186,9 +186,11 @@ __NAME__    = 'python-x2go'
 __VERSION__ = '0.5.0.0'
 
 import os
+from defaults import X2GOCLIENT_OS
 
-# enforce "ares" resolve in gevent (>= 1.0~)...
-os.environ["GEVENT_RESOLVER"] = "ares"
+if X2GOCLIENT_OS != 'Windows':
+    # enforce "ares" resolve in gevent (>= 1.0~)...
+    os.environ["GEVENT_RESOLVER"] = "ares"
 
 from gevent import monkey
 monkey.patch_all()
@@ -206,7 +208,6 @@ from log import *
 
 from cleanup import x2go_cleanup
 
-from defaults import X2GOCLIENT_OS
 from defaults import CURRENT_LOCAL_USER
 from defaults import LOCAL_HOME
 from defaults import X2GO_CLIENT_ROOTDIR
@@ -214,7 +215,6 @@ from defaults import X2GO_SESSIONS_ROOTDIR
 from defaults import X2GO_SSH_ROOTDIR
 from defaults import BACKENDS
 
-if X2GOCLIENT_OS == 'Windows':
     from xserver import X2GoClientXConfig, X2GoXServer
 
 # compat section

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git