jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout 2012-10-24 01:23:08 -07:00
commit 931d49560a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sleekxmpp/util/__init__.py
View File

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

2
sleekxmpp/xmlstream/filesocket.py
View File

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