Add a connect_to parameter to zerorpc.Client

bombela · bombela · commit 6174228b9223 · 2012-04-12T17:00:48.000-07:00
For the most common case:
	c = zerorpc.Client()
	c.connect('tcp://blabla:42')

It's now possible to use a shorter form:
	c = zerorpc.Client('tcp://blabla:42')
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Open Source Initiative OSI - The MIT License (MIT):Licensing
+#
+# The MIT License (MIT)
+# Copyright (c) 2012 DotCloud Inc (opensource@dotcloud.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+import gevent
+
+import zerorpc
+from testutils import teardown, random_ipc_endpoint
+
+def test_client_connect():
+    endpoint = random_ipc_endpoint()
+
+    class MySrv(zerorpc.Server):
+
+        def lolita(self):
+            return 42
+
+    srv = MySrv()
+    srv.bind(endpoint)
+    gevent.spawn(srv.run)
+
+    client = zerorpc.Client()
+    client.connect(endpoint)
+
+    assert client.lolita() == 42
+
+def test_client_quick_connect():
+    endpoint = random_ipc_endpoint()
+
+    class MySrv(zerorpc.Server):
+
+        def lolita(self):
+            return 42
+
+    srv = MySrv()
+    srv.bind(endpoint)
+    gevent.spawn(srv.run)
+
+    client = zerorpc.Client(endpoint)
+
+    assert client.lolita() == 42
diff --git a/zerorpc/core.py b/zerorpc/core.py
@@ -345,11 +345,13 @@ def close(self):
 class Client(SocketBase, ClientBase):
     patterns = [PatternReqStream(), PatternReqRep()]
 
-    def __init__(self, context=None, timeout=30, heartbeat=5,
+    def __init__(self, connect_to=None, context=None, timeout=30, heartbeat=5,
             passive_heartbeat=False):
         SocketBase.__init__(self, zmq.XREQ, context=context)
         ClientBase.__init__(self, self._events, Client.patterns, context,
                 timeout, heartbeat, passive_heartbeat)
+        if connect_to:
+            self.connect(connect_to)
 
     def close(self):
         ClientBase.close(self)
