diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2014-08-19 11:58:33 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-09-01 02:47:15 +0200 |
| commit | 5a8881000cc4ceaf0fa15084f650cf3f3343c36a (patch) | |
| tree | d017716f817a1c67a1e1ea1ed8982647b7436229 /slixmpp/util/__init__.py | |
| parent | 70839368c1e204cc6527cbb1e38a9928dce70562 (diff) | |
| download | slixmpp-5a8881000cc4ceaf0fa15084f650cf3f3343c36a.tar.gz slixmpp-5a8881000cc4ceaf0fa15084f650cf3f3343c36a.tar.bz2 slixmpp-5a8881000cc4ceaf0fa15084f650cf3f3343c36a.tar.xz slixmpp-5a8881000cc4ceaf0fa15084f650cf3f3343c36a.zip | |
Remove support for gevent, incompatible with python3.
Diffstat (limited to 'slixmpp/util/__init__.py')
| -rw-r--r-- | slixmpp/util/__init__.py | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/slixmpp/util/__init__.py b/slixmpp/util/__init__.py index b4243e83..df09f771 100644 --- a/slixmpp/util/__init__.py +++ b/slixmpp/util/__init__.py @@ -18,26 +18,10 @@ from slixmpp.util.misc_ops import bytes, unicode, hashes, hash, \ # ===================================================================== # Standardize import of Queue class: -import sys - -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: - try: - import queue - except ImportError: - import Queue as queue - Queue = queue.Queue +try: + import queue +except ImportError: + import Queue as queue +Queue = queue.Queue QueueEmpty = queue.Empty |