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

Remove support for gevent, incompatible with python3.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2014-08-19 11:58:33 +02:00 committed by Florent Le Coz
parent 70839368c1
commit 5a8881000c
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
slixmpp/util/__init__.py
View File

@ -18,26 +18,10 @@ from slixmpp.util.misc_ops import bytes, unicode, hashes, hash, \
# ===================================================================== # =====================================================================
# Standardize import of Queue class: # Standardize import of Queue class:
import sys try:
import queue
def _gevent_threads_enabled(): except ImportError:
if not 'gevent' in sys.modules: import Queue as queue
return False Queue = queue.Queue
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
QueueEmpty = queue.Empty QueueEmpty = queue.Empty

7
testall.py
View File

@ -1,9 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import sys import sys
if len(sys.argv)>1 and sys.argv[1].lower() == 'gevent':
from gevent import monkey
monkey.patch_all()
import os import os
import logging import logging
@ -61,7 +58,7 @@ class TestCommand(distutils.core.Command):
if __name__ == '__main__': if __name__ == '__main__':
result = run_tests() result = run_tests()
print("<tests %s ran='%s' errors='%s' fails='%s' success='%s' gevent_enabled=%s/>" % ( print("<tests %s ran='%s' errors='%s' fails='%s' success='%s'/>" % (
"xmlns='http//andyet.net/protocol/tests'", "xmlns='http//andyet.net/protocol/tests'",
result.testsRun, len(result.errors), result.testsRun, len(result.errors),
len(result.failures), result.wasSuccessful(),'gevent' in sys.modules)) len(result.failures), result.wasSuccessful()))