diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-09-12 10:15:53 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-09-12 10:15:53 -0700 |
| commit | 07284f380fa0a893a5ef56774fcef71a47851668 (patch) | |
| tree | 27e815557475b9c8f8edb2c37bb242d3b40143b5 /sleekxmpp | |
| parent | e60401278f8933211eaac168475a3c332d62531c (diff) | |
| parent | a1d988fed5839a0d6f44340ed3dae8496e1b9a58 (diff) | |
| download | slixmpp-07284f380fa0a893a5ef56774fcef71a47851668.tar.gz slixmpp-07284f380fa0a893a5ef56774fcef71a47851668.tar.bz2 slixmpp-07284f380fa0a893a5ef56774fcef71a47851668.tar.xz slixmpp-07284f380fa0a893a5ef56774fcef71a47851668.zip | |
Merge pull request #207 from spartanbits/pull_request_gevent_check
Pull request gevent check
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/util/__init__.py | 13 |
1 files changed, 12 insertions, 1 deletions
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: |