Subscriber/Puller constructors take a methods argument

Louis Opter · Louis Opter · commit bc0fc0a1b147 · 2012-04-03T00:55:04.000Z
The Subscriber and Puller constructors were missing the `methods'
arguments making them unusable with an already instantied object.

Likewise, the unused name argument has been removed from the Puller
class.
diff --git a/zerorpc/core.py b/zerorpc/core.py
@@ -336,8 +336,7 @@ def __getattr__(self, method):
 
 class Puller(SocketBase):
 
-    def __init__(self, methods=None, name=None, context=None,
-            zmq_socket=zmq.PULL):
+    def __init__(self, methods=None, context=None, zmq_socket=zmq.PULL):
         super(Puller, self).__init__(zmq_socket, context=context)
 
         if methods is None:
@@ -398,6 +397,7 @@ def __init__(self, context=None):
 
 class Subscriber(Puller):
 
-    def __init__(self, context=None):
-        super(Subscriber, self).__init__(context=context, zmq_socket=zmq.SUB)
+    def __init__(self, methods=None, context=None):
+        super(Subscriber, self).__init__(methods=methods, context=context,
+                zmq_socket=zmq.SUB)
         self._events.setsockopt(zmq.SUBSCRIBE, '')
