Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 185c254

Browse files
author
Jérôme Petazzoni
committed
Merge pull request 0rpc#80 from psantann/master
Fixed deprecation warnings & Update README example
2 parents e6e6ad2 + 09b8283 commit 185c254

File tree

11 files changed

+193
-79
lines changed

11 files changed

+193
-79
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ dist/
55
*.egg
66
*.egg-info
77
.tox
8+
.idea

‎README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ your server to act as a kind of worker, and connect to a hub or queue which
108108
will dispatch requests. You can achieve this by swapping "--bind" and
109109
"--connect"::
110110

111-
$ zerorpc --bind tcp://*:1234 localtime
111+
$ zerorpc --bind tcp://*:1234 strftime %Y/%m/%d
112112

113-
We now have "something" wanting to call the "localtime" function, and waiting
113+
We now have "something" wanting to call the "strftime" function, and waiting
114114
for a worker to connect to it. Let's start the worker::
115115

116-
$ zerorpc --server tcp://*:1234 time
116+
$ zerorpc --server tcp://127.0.0.1:1234 time
117117

118118
The worker will connect to the listening client and ask him "what should I
119-
do?"; the client will send the "localtime" function call; the worker will
119+
do?"; the client will send the "strftime" function call; the worker will
120120
execute it and return the result. The first program will display the
121121
local time and exit. The worker will remain running.
122122

‎tests/test_buffered_channel.py

Lines changed: 83 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
from nose.tools import assert_raises
2727
import gevent
28+
import sys
2829

2930
from zerorpc import zmq
3031
import zerorpc
@@ -55,8 +56,11 @@ def test_close_server_bufchan():
5556
gevent.sleep(3)
5657
print 'CLOSE SERVER SOCKET!!!'
5758
server_bufchan.close()
58-
with assert_raises(zerorpc.LostRemote):
59-
client_bufchan.recv()
59+
if sys.version_info < (2, 7):
60+
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
61+
else:
62+
with assert_raises(zerorpc.LostRemote):
63+
client_bufchan.recv()
6064
print 'CLIENT LOST SERVER :)'
6165
client_bufchan.close()
6266
server.close()
@@ -87,8 +91,11 @@ def test_close_client_bufchan():
8791
gevent.sleep(3)
8892
print 'CLOSE CLIENT SOCKET!!!'
8993
client_bufchan.close()
90-
with assert_raises(zerorpc.LostRemote):
91-
server_bufchan.recv()
94+
if sys.version_info < (2, 7):
95+
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
96+
else:
97+
with assert_raises(zerorpc.LostRemote):
98+
client_bufchan.recv()
9299
print 'SERVER LOST CLIENT :)'
93100
server_bufchan.close()
94101
server.close()
@@ -117,8 +124,11 @@ def test_heartbeat_can_open_channel_server_close():
117124
gevent.sleep(3)
118125
print 'CLOSE SERVER SOCKET!!!'
119126
server_bufchan.close()
120-
with assert_raises(zerorpc.LostRemote):
121-
client_bufchan.recv()
127+
if sys.version_info < (2, 7):
128+
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
129+
else:
130+
with assert_raises(zerorpc.LostRemote):
131+
client_bufchan.recv()
122132
print 'CLIENT LOST SERVER :)'
123133
client_bufchan.close()
124134
server.close()
@@ -148,8 +158,11 @@ def test_heartbeat_can_open_channel_client_close():
148158
print 'CLOSE CLIENT SOCKET!!!'
149159
client_bufchan.close()
150160
client.close()
151-
with assert_raises(zerorpc.LostRemote):
152-
server_bufchan.recv()
161+
if sys.version_info < (2, 7):
162+
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
163+
else:
164+
with assert_raises(zerorpc.LostRemote):
165+
client_bufchan.recv()
153166
print 'SERVER LOST CLIENT :)'
154167
server_bufchan.close()
155168
server.close()
@@ -220,8 +233,11 @@ def client_do():
220233
assert event.name == 'OK'
221234
assert list(event.args) == [x + x * x]
222235
client_bufchan.emit('add', (x, x * x))
223-
with assert_raises(zerorpc.LostRemote):
224-
event = client_bufchan.recv()
236+
if sys.version_info < (2, 7):
237+
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
238+
else:
239+
with assert_raises(zerorpc.LostRemote):
240+
client_bufchan.recv()
225241
client_bufchan.close()
226242

227243
coro_pool = gevent.pool.Pool()
@@ -281,8 +297,11 @@ def server_do():
281297
assert event.name == 'add'
282298
server_bufchan.emit('OK', (sum(event.args),))
283299

284-
with assert_raises(zerorpc.LostRemote):
285-
event = server_bufchan.recv()
300+
if sys.version_info < (2, 7):
301+
assert_raises(zerorpc.LostRemote, server_bufchan.recv)
302+
else:
303+
with assert_raises(zerorpc.LostRemote):
304+
server_bufchan.recv()
286305
server_bufchan.close()
287306

288307
coro_pool.spawn(server_do)
@@ -307,12 +326,21 @@ def client_do():
307326
client_hbchan = zerorpc.HeartBeatOnChannel(client_channel, freq=2)
308327
client_bufchan = zerorpc.BufferedChannel(client_hbchan)
309328

310-
with assert_raises(zerorpc.TimeoutExpired):
311-
for x in xrange(10):
312-
client_bufchan.emit('sleep', (x,))
313-
event = client_bufchan.recv(timeout=3)
314-
assert event.name == 'OK'
315-
assert list(event.args) == [x]
329+
if sys.version_info < (2, 7):
330+
def _do_with_assert_raises():
331+
for x in xrange(10):
332+
client_bufchan.emit('sleep', (x,))
333+
event = client_bufchan.recv(timeout=3)
334+
assert event.name == 'OK'
335+
assert list(event.args) == [x]
336+
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
337+
else:
338+
with assert_raises(zerorpc.TimeoutExpired):
339+
for x in xrange(10):
340+
client_bufchan.emit('sleep', (x,))
341+
event = client_bufchan.recv(timeout=3)
342+
assert event.name == 'OK'
343+
assert list(event.args) == [x]
316344
client_bufchan.close()
317345

318346
coro_pool = gevent.pool.Pool()
@@ -324,12 +352,21 @@ def server_do():
324352
server_hbchan = zerorpc.HeartBeatOnChannel(server_channel, freq=2)
325353
server_bufchan = zerorpc.BufferedChannel(server_hbchan)
326354

327-
with assert_raises(zerorpc.LostRemote):
328-
for x in xrange(20):
329-
event = server_bufchan.recv()
330-
assert event.name == 'sleep'
331-
gevent.sleep(event.args[0])
332-
server_bufchan.emit('OK', event.args)
355+
if sys.version_info < (2, 7):
356+
def _do_with_assert_raises():
357+
for x in xrange(20):
358+
event = server_bufchan.recv()
359+
assert event.name == 'sleep'
360+
gevent.sleep(event.args[0])
361+
server_bufchan.emit('OK', event.args)
362+
assert_raises(zerorpc.LostRemote, _do_with_assert_raises)
363+
else:
364+
with assert_raises(zerorpc.LostRemote):
365+
for x in xrange(20):
366+
event = server_bufchan.recv()
367+
assert event.name == 'sleep'
368+
gevent.sleep(event.args[0])
369+
server_bufchan.emit('OK', event.args)
333370
server_bufchan.close()
334371

335372

@@ -373,15 +410,29 @@ def client_do():
373410
coro_pool.spawn(client_do)
374411

375412
def server_do():
376-
with assert_raises(CongestionError):
377-
for x in xrange(200):
378-
if server_bufchan.emit('coucou', x, block=False) == False:
379-
raise CongestionError() # will fail when x == 1
413+
if sys.version_info < (2, 7):
414+
def _do_with_assert_raises():
415+
for x in xrange(200):
416+
if not server_bufchan.emit('coucou', x, block=False):
417+
raise CongestionError() # will fail when x == 1
418+
assert_raises(CongestionError, _do_with_assert_raises)
419+
else:
420+
with assert_raises(CongestionError):
421+
for x in xrange(200):
422+
if not server_bufchan.emit('coucou', x, block=False):
423+
raise CongestionError() # will fail when x == 1
380424
server_bufchan.emit('coucou', 1) # block until receiver is ready
381-
with assert_raises(CongestionError):
382-
for x in xrange(2, 200):
383-
if server_bufchan.emit('coucou', x, block=False) == False:
384-
raise CongestionError() # will fail when x == 100
425+
if sys.version_info < (2, 7):
426+
def _do_with_assert_raises():
427+
for x in xrange(2, 200):
428+
if not server_bufchan.emit('coucou', x, block=False):
429+
raise CongestionError() # will fail when x == 100
430+
assert_raises(CongestionError, _do_with_assert_raises)
431+
else:
432+
with assert_raises(CongestionError):
433+
for x in xrange(2, 200):
434+
if not server_bufchan.emit('coucou', x, block=False):
435+
raise CongestionError() # will fail when x == 100
385436
for x in xrange(101, 200):
386437
server_bufchan.emit('coucou', x) # block until receiver is ready
387438

‎tests/test_client_async.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
from nose.tools import assert_raises
2727
import gevent
28+
import sys
2829

2930
from zerorpc import zmq
3031
import zerorpc
@@ -51,8 +52,14 @@ def add(self, a, b):
5152
client.connect(endpoint)
5253

5354
async_result = client.add(1, 4, async=True)
54-
with assert_raises(zerorpc.TimeoutExpired):
55-
print async_result.get()
55+
56+
if sys.version_info < (2, 7):
57+
def _do_with_assert_raises():
58+
print async_result.get()
59+
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
60+
else:
61+
with assert_raises(zerorpc.TimeoutExpired):
62+
print async_result.get()
5663
client.close()
5764
srv.close()
5865

‎tests/test_heartbeat.py

Lines changed: 61 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
from nose.tools import assert_raises
2727
import gevent
28+
import sys
2829

2930
from zerorpc import zmq
3031
import zerorpc
@@ -53,8 +54,11 @@ def test_close_server_hbchan():
5354
gevent.sleep(3)
5455
print 'CLOSE SERVER SOCKET!!!'
5556
server_hbchan.close()
56-
with assert_raises(zerorpc.LostRemote):
57-
client_hbchan.recv()
57+
if sys.version_info < (2, 7):
58+
assert_raises(zerorpc.LostRemote, client_hbchan.recv)
59+
else:
60+
with assert_raises(zerorpc.LostRemote):
61+
client_hbchan.recv()
5862
print 'CLIENT LOST SERVER :)'
5963
client_hbchan.close()
6064
server.close()
@@ -83,8 +87,11 @@ def test_close_client_hbchan():
8387
gevent.sleep(3)
8488
print 'CLOSE CLIENT SOCKET!!!'
8589
client_hbchan.close()
86-
with assert_raises(zerorpc.LostRemote):
87-
server_hbchan.recv()
90+
if sys.version_info < (2, 7):
91+
assert_raises(zerorpc.LostRemote, server_hbchan.recv)
92+
else:
93+
with assert_raises(zerorpc.LostRemote):
94+
server_hbchan.recv()
8895
print 'SERVER LOST CLIENT :)'
8996
server_hbchan.close()
9097
server.close()
@@ -111,8 +118,11 @@ def test_heartbeat_can_open_channel_server_close():
111118
gevent.sleep(3)
112119
print 'CLOSE SERVER SOCKET!!!'
113120
server_hbchan.close()
114-
with assert_raises(zerorpc.LostRemote):
115-
client_hbchan.recv()
121+
if sys.version_info < (2, 7):
122+
assert_raises(zerorpc.LostRemote, client_hbchan.recv)
123+
else:
124+
with assert_raises(zerorpc.LostRemote):
125+
client_hbchan.recv()
116126
print 'CLIENT LOST SERVER :)'
117127
client_hbchan.close()
118128
server.close()
@@ -140,8 +150,11 @@ def test_heartbeat_can_open_channel_client_close():
140150
print 'CLOSE CLIENT SOCKET!!!'
141151
client_hbchan.close()
142152
client.close()
143-
with assert_raises(zerorpc.LostRemote):
144-
server_hbchan.recv()
153+
if sys.version_info < (2, 7):
154+
assert_raises(zerorpc.LostRemote, server_hbchan.recv)
155+
else:
156+
with assert_raises(zerorpc.LostRemote):
157+
server_hbchan.recv()
145158
print 'SERVER LOST CLIENT :)'
146159
server_hbchan.close()
147160
server.close()
@@ -209,8 +222,11 @@ def client_do():
209222
assert event.name == 'OK'
210223
assert list(event.args) == [x + x * x]
211224
client_hbchan.emit('add', (x, x * x))
212-
with assert_raises(zerorpc.LostRemote):
213-
event = client_hbchan.recv()
225+
if sys.version_info < (2, 7):
226+
assert_raises(zerorpc.LostRemote, client_hbchan.recv)
227+
else:
228+
with assert_raises(zerorpc.LostRemote):
229+
client_hbchan.recv()
214230
client_hbchan.close()
215231

216232
client_task = gevent.spawn(client_do)
@@ -266,8 +282,11 @@ def server_do():
266282
assert event.name == 'add'
267283
server_hbchan.emit('OK', (sum(event.args),))
268284

269-
with assert_raises(zerorpc.LostRemote):
270-
event = server_hbchan.recv()
285+
if sys.version_info < (2, 7):
286+
assert_raises(zerorpc.LostRemote, server_hbchan.recv)
287+
else:
288+
with assert_raises(zerorpc.LostRemote):
289+
server_hbchan.recv()
271290
server_hbchan.close()
272291

273292
server_task = gevent.spawn(server_do)
@@ -292,12 +311,21 @@ def client_do():
292311
client_channel = client.channel()
293312
client_hbchan = zerorpc.HeartBeatOnChannel(client_channel, freq=2)
294313

295-
with assert_raises(zerorpc.TimeoutExpired):
296-
for x in xrange(10):
297-
client_hbchan.emit('sleep', (x,))
298-
event = client_hbchan.recv(timeout=3)
299-
assert event.name == 'OK'
300-
assert list(event.args) == [x]
314+
if sys.version_info < (2, 7):
315+
def _do_with_assert_raises():
316+
for x in xrange(10):
317+
client_hbchan.emit('sleep', (x,))
318+
event = client_hbchan.recv(timeout=3)
319+
assert event.name == 'OK'
320+
assert list(event.args) == [x]
321+
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
322+
else:
323+
with assert_raises(zerorpc.TimeoutExpired):
324+
for x in xrange(10):
325+
client_hbchan.emit('sleep', (x,))
326+
event = client_hbchan.recv(timeout=3)
327+
assert event.name == 'OK'
328+
assert list(event.args) == [x]
301329
client_hbchan.close()
302330

303331
client_task = gevent.spawn(client_do)
@@ -307,12 +335,21 @@ def server_do():
307335
server_channel = server.channel(event)
308336
server_hbchan = zerorpc.HeartBeatOnChannel(server_channel, freq=2)
309337

310-
with assert_raises(zerorpc.LostRemote):
311-
for x in xrange(20):
312-
event = server_hbchan.recv()
313-
assert event.name == 'sleep'
314-
gevent.sleep(event.args[0])
315-
server_hbchan.emit('OK', event.args)
338+
if sys.version_info < (2, 7):
339+
def _do_with_assert_raises():
340+
for x in xrange(20):
341+
event = server_hbchan.recv()
342+
assert event.name == 'sleep'
343+
gevent.sleep(event.args[0])
344+
server_hbchan.emit('OK', event.args)
345+
assert_raises(zerorpc.LostRemote, _do_with_assert_raises)
346+
else:
347+
with assert_raises(zerorpc.LostRemote):
348+
for x in xrange(20):
349+
event = server_hbchan.recv()
350+
assert event.name == 'sleep'
351+
gevent.sleep(event.args[0])
352+
server_hbchan.emit('OK', event.args)
316353
server_hbchan.close()
317354

318355
server_task = gevent.spawn(server_do)

0 commit comments

Comments
 (0)