Merge pull request nats-io#33 from charliestrawn/loose-pin-tornado

Pin tornado version to less than 5 in requirements.

Author: wallyqs

requirements.txt

@@ -1 +1 @@
-tornado>=4.2
+tornado>=4.2,<5.0

script/test.sh

@@ -3,7 +3,6 @@
 export PYTHONPATH=$(pwd)
 
 pip install --upgrade pip
-pip install unittest2
 pip install -r requirements.txt
 
 python tests/test.py

tests/client_test.py

@@ -1,9 +1,5 @@
 import sys
-
-if sys.version_info >= (2, 7):
-     import unittest
-else:
-    import unittest2 as unittest
+import unittest
 
 import tornado.httpclient
 import tornado.concurrent
@@ -254,7 +250,7 @@ def test_parse_info(self):
           self.assertIn("host", info_keys)
           self.assertIn("port", info_keys)
           self.assertIn("auth_required", info_keys)
-          self.assertIn("ssl_required", info_keys)
+          self.assertIn("tls_required", info_keys)
           self.assertIn("max_payload", info_keys)
 
      @tornado.testing.gen_test(timeout=5)

tests/protocol_test.py

@@ -1,9 +1,5 @@
 import sys
-
-if sys.version_info >= (2, 7):
-     import unittest
-else:
-    import unittest2 as unittest
+import unittest
 
 import tornado.testing
 import tornado.gen