From 1a2b404076a04953e63b8bd120d70e237c185d44 Mon Sep 17 00:00:00 2001 From: Pedro Vicente Date: Mon, 12 Nov 2012 13:28:20 +0100 Subject: Checked if gevent thread is patched to do the right import --- sleekxmpp/util/__init__.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sleekxmpp/util/__init__.py b/sleekxmpp/util/__init__.py index 1e4af02d..957a9335 100644 --- a/sleekxmpp/util/__init__.py +++ b/sleekxmpp/util/__init__.py @@ -18,7 +18,18 @@ from sleekxmpp.util.misc_ops import bytes, unicode, hashes, hash, \ # Standardize import of Queue class: import sys -if 'gevent' in sys.modules: + +def _gevent_threads_enabled(): + if not 'gevent' in sys.modules: + return False + try: + from gevent import thread as green_thread + thread = __import__('thread') + return thread.LockType is green_thread.LockType + except ImportError: + return False + +if _gevent_threads_enabled(): import gevent.queue as queue Queue = queue.JoinableQueue else: -- cgit v1.2.3