Merge branch 'master' into tornado42

tests/test_pubsub.py

@@ -6,6 +6,7 @@
 
 from tornadis.pubsub import PubSubClient
 from tornadis.client import Client
+from tornadis.exceptions import ClientError
 from support import test_redis_or_raise_skiptest
 
 
@@ -67,3 +68,26 @@ def test_pubsub(self):
         yield c.pubsub_punsubscribe("bar2*")
         self.assertFalse(c.subscribed)
         c.disconnect()
+
+    @tornado.testing.gen_test
+    def test_issue17(self):
+        c = PubSubClient()
+        yield c.connect()
+        res = yield c.pubsub_subscribe("foo")
+        self.assertTrue(res)
+        self.assertTrue(c.subscribed)
+        res = yield c.pubsub_unsubscribe()
+        self.assertTrue(res)
+        self.assertFalse(c.subscribed)
+        c.disconnect()
+
+    @tornado.testing.gen_test
+    def test_empty_subscribe(self):
+        c = PubSubClient()
+        yield c.connect()
+        try:
+            yield c.pubsub_subscribe()
+            raise Exception("ClientError not raised")
+        except ClientError:
+            pass
+        c.disconnect()

tornadis/pubsub.py

@@ -39,6 +39,9 @@ def pubsub_subscribe(self, *args):
         Returns:
             Future: Future with True as result if the subscribe is ok.
 
+        Raises:
+            ClientError: if you don't provide at least one channel
+
         Examples:
 
             >>> yield client.pubsub_subscribe("channel1", "channel2")
@@ -56,6 +59,9 @@ def pubsub_psubscribe(self, *args):
         Returns:
             Future: Future with True as result if the subscribe is ok.
 
+        Raises:
+            ClientError: if you don't provide at least one pattern
+
         Examples:
 
             >>> yield client.pubsub_psubscribe("channel*", "foo*")
@@ -64,6 +70,8 @@ def pubsub_psubscribe(self, *args):
 
     @tornado.gen.coroutine
     def _pubsub_subscribe(self, command, *args):
+        if len(args) == 0:
+            raise ClientError("you must provide at least one argument")
         results = yield Client.call(self, command, *args,
                                     __multiple_replies=len(args))
         for reply in results:
@@ -110,8 +118,13 @@ def pubsub_punsubscribe(self, *args):
 
     @tornado.gen.coroutine
     def _pubsub_unsubscribe(self, command, *args):
+        if len(args) == 0:
+            # see https://github.com/thefab/tornadis/issues/17
+            args_len = 1
+        else:
+            args_len = len(args)
         results = yield Client.call(self, command, *args,
-                                    __multiple_replies=len(args))
+                                    __multiple_replies=args_len)
         for reply in results:
             if isinstance(reply, ConnectionError) or len(reply) != 3 or \
                     reply[0].lower() != command.lower():