1 files changed, 21 insertions, 4 deletions
diff --git a/sleekxmpp/util/__init__.py b/sleekxmpp/util/__init__.py
index 1e4af02d..47a935af 100644
--- a/sleekxmpp/util/__init__.py
+++ b/sleekxmpp/util/__init__.py
@@ -11,21 +11,38 @@
 
 
 from sleekxmpp.util.misc_ops import bytes, unicode, hashes, hash, \
-                                    num_to_bytes, bytes_to_num, quote, XOR
+                                    num_to_bytes, bytes_to_num, quote, \
+                                    XOR, safedict
 
 
 # =====================================================================
 # 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
+    _queue = queue.JoinableQueue
 else:
     try:
         import queue
     except ImportError:
         import Queue as queue
-    Queue = queue.Queue
+    _queue = queue.Queue
+class Queue(_queue):
+    def put(self, item, block=True, timeout=None):
+        if _queue.full(self):
+            _queue.get(self)
+        return _queue.put(self, item, block, timeout)
 
 QueueEmpty = queue.Empty