diff options
| -rw-r--r-- | sleekxmpp/util/__init__.py | 13 | ||||
| -rwxr-xr-x | testall.py | 10 |
2 files changed, 19 insertions, 4 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: @@ -1,7 +1,11 @@ #!/usr/bin/env python -import os import sys +if len(sys.argv)>1 and sys.argv[1].lower() == 'gevent': + from gevent import monkey + monkey.patch_all() + +import os import logging import unittest import distutils.core @@ -57,7 +61,7 @@ class TestCommand(distutils.core.Command): if __name__ == '__main__': result = run_tests() - print("<tests %s ran='%s' errors='%s' fails='%s' success='%s' />" % ( + print("<tests %s ran='%s' errors='%s' fails='%s' success='%s' gevent_enabled=%s/>" % ( "xmlns='http//andyet.net/protocol/tests'", result.testsRun, len(result.errors), - len(result.failures), result.wasSuccessful())) + len(result.failures), result.wasSuccessful(),'gevent' in sys.modules)) |