Merge pull request #1 from hroncok/notoro

Make toro only required with tornado 4

setup.py

@@ -19,9 +19,16 @@
 
 tornado_requires = [
     "tornado>=4.0,<6.0",
-    "toro>=0.6"
 ]
 
+try:
+    from tornado import version as tornado_version
+    if tornado_version < '5.0':
+        tornado_requires.append("toro>=0.6")
+except ImportError:
+    # tornado will now only get installed and we'll get the newer one
+    pass
+
 dev_requires = [
     "cython>=0.23",
     "flake8>=2.5",

thriftpy/tornado.py

@@ -37,7 +37,11 @@
 try:
     from tornado.locks import Lock
 except ImportError:
-    from toro import Lock
+    try:
+        from toro import Lock
+    except ImportError:
+        raise RuntimeError('With tornado {}, you need to install '
+                           '"toro"'.format(tornado_version))
 
 
 logger = logging.getLogger(__name__)

tox.ini

@@ -12,7 +12,6 @@ commands =
 deps =
     pytest
     tornado>=4.0,<6.0
-    toro
     cython
 
 [testenv:flake8]