conditionalize toro input and use native asyncio Queue class on modern python

asyncmc/pool.py

@@ -3,7 +3,12 @@
 import socket
 import binascii
 from tornado import gen
-from toro import Queue, Full, Empty
+try:
+    from toro import Queue, Full as QueueFull, Empty as QueueEmpty
+    using_toro = True
+except ImportError:
+    from asyncio import Queue, QueueFull, QueueEmpty
+    using_toro = False
 
 from .host import Host
 from . import constants as const
@@ -20,12 +25,15 @@ def __init__(self, servers, maxsize=15, minsize=1, loop=None, debug=0):
                 format="'%(levelname)s %(asctime)s"
                 " %(module)s:%(lineno)d %(process)d %(thread)d %(message)s'"
             )
-        self._loop = loop
         self._servers = servers
         self._minsize = minsize
         self._debug = debug
         self._in_use = set()
-        self._pool = Queue(maxsize, io_loop=self._loop)
+        if using_toro:
+            self._loop = loop
+            self._pool = Queue(maxsize, io_loop=self._loop)
+        else:
+            self._pool = Queue(maxsize)
 
     @gen.coroutine
     def clear(self):
@@ -68,7 +76,7 @@ def release(self, conn):
         self._in_use.remove(conn)
         try:
             self._pool.put_nowait(conn)
-        except (Empty, Full):
+        except (QueueEmpty, QueueFull):
             conn.close_socket()
 
 

requirements.txt

@@ -1,5 +1,5 @@
 pep8
-tornado==4.1
+tornado==5.0
 pycodestyle==2.3.1
 pyflakes
-toro==0.8
+toro==0.8;python_version < 3.0

setup.py

@@ -4,14 +4,18 @@
 
 version = '0.6.7'
 
+
 def read(f):
     return open(os.path.join(os.path.dirname(__file__), f)).read().strip()
 
+
 install_requires = [
-    'tornado>=4.1',
-    'toro>=0.8'
+    'tornado>=5.0',
 ]
 
+if sys.version_info < (3, 0):
+    install_requires.append('toro >= 0.8')
+
 setup(name='asyncmc',
       version=version,
       description=('Minimal pure python tornado memcached client'),
@@ -32,5 +36,5 @@ def read(f):
       url='https://github.com/ErDmKo/asyncmc/',
       license='MIT',
       packages=find_packages(),
-      install_requires = install_requires,
-      include_package_data = True)
+      install_requires=install_requires,
+      include_package_data=True)