Merge branch 'master' into develop

sleekxmpp/util/__init__.py

@@ -17,11 +17,15 @@ from sleekxmpp.util.misc_ops import bytes, unicode, hashes, hash, \
 # =====================================================================
 # Standardize import of Queue class:
 
-try:
-    import queue
-except ImportError:
-    import Queue as queue
+import sys
+if 'gevent' in sys.modules:
+    import gevent.queue as queue
+    Queue = queue.JoinableQueue
+else:
+    try:
+        import queue
+    except ImportError:
+        import Queue as queue
+    Queue = queue.Queue
 
-
-Queue = queue.Queue
 QueueEmpty = queue.Empty

sleekxmpp/xmlstream/filesocket.py

@@ -34,7 +34,7 @@ class FileSocket(_fileobject):
             return data
 
 
-class Socket26(socket._socketobject):
+class Socket26(socket.socket):
 
     """A custom socket implementation that uses our own FileSocket class
     to work around issues in Python 2.6 when using sockets as files.