use torando.queues instead of toro Queues

asyncmc/client.py

@@ -125,6 +125,8 @@ def stats(self, conn, args=None):
         resp = yield conn.send_cmd(cmd)
         result = {}
         while resp != b'END\r\n':
+            # Ubuntu response fix
+            resp = resp.replace(type(resp)(" (Ubuntu)"), type(resp)(""))
             terms = resp.split()
 
             if len(terms) == 2 and terms[0] == b'STAT':
@@ -149,7 +151,10 @@ def version(self, conn):
         response = yield conn.send_cmd(command)
         if not response.startswith(const.VERSION):
             raise ClientException('Memcached version failed', response)
-        version, number = response.split()
+
+        response = response.split()
+        number = response[1]
+
         raise gen.Return(number)
 
     def _key_type(self, key_list=[], key=None):

asyncmc/pool.py

@@ -3,7 +3,7 @@
 import socket
 import binascii
 from tornado import gen
-from toro import Queue, Full, Empty
+from tornado.queues import Queue, QueueEmpty, QueueFull
 
 from .host import Host
 from . import constants as const
@@ -25,7 +25,7 @@ def __init__(self, servers, maxsize=15, minsize=1, loop=None, debug=0):
         self._minsize = minsize
         self._debug = debug
         self._in_use = set()
-        self._pool = Queue(maxsize, io_loop=self._loop)
+        self._pool = Queue(maxsize)
 
     @gen.coroutine
     def clear(self):
@@ -68,7 +68,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()
 
 

setup.py

@@ -2,14 +2,13 @@
 import sys
 from setuptools import setup, find_packages
 
-version = '0.6.1'
+version = '0.6.2'
 
 def read(f):
     return open(os.path.join(os.path.dirname(__file__), f)).read().strip()
 
 install_requires = [
-    'tornado>=4.1',
-    'toro>=0.8'
+    'tornado>=4.2'
 ]
 
 setup(name='asyncmc',