Skip to content

Commit fc83236

Browse files
bombelabombela
committed
Merge branch 'python3.4'
2 parents ab83b6d + 150549b commit fc83236

28 files changed

+388
-308
lines changed

‎.travis.yml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1+
sudo: false
12
language: python
23
python:
34
- 2.6
45
- 2.7
6+
- 3.4
7+
- 3.5
58
env:
69
matrix:
7-
- PYZMQ='pyzmq>=14'
8-
- PYZMQ='pyzmq>=14.3'
9-
- PYZMQ='pyzmq>=14.2,<14.3'
10-
- PYZMQ='pyzmq>=14.1,<14.2'
11-
- PYZMQ='pyzmq>=14.0,<14.1'
12-
- PYZMQ='pyzmq<14'
10+
- PYZMQ='pyzmq>=15'
11+
- PYZMQ='pyzmq>=14,<15'
12+
- PYZMQ='pyzmq>=13,<14'
1313
matrix:
1414
fast_finish: true
15-
script:
16-
- flake8 --ignore=E501,E128 zerorpc bin
17-
- ZPC_TEST_TIME_FACTOR=0.2 nosetests -v
18-
sudo: false
1915
addons:
2016
apt:
2117
packages:
2218
- python-dev
2319
- libevent-dev
2420
install:
25-
- pip install flake8
26-
- "pip install nose gevent msgpack-python $PYZMQ"
27-
- pip install . --no-deps
21+
- if [ $TRAVIS_PYTHON_VERSION != '2.6' ]; then
22+
pip install flake8;
23+
fi
24+
- "pip install nose $PYZMQ"
25+
- pip install .
26+
script:
27+
- if [ $TRAVIS_PYTHON_VERSION != '2.6' ]; then
28+
flake8 --ignore=E501,E128 zerorpc bin;
29+
fi
30+
- nosetests -v

‎setup.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2323
# SOFTWARE.
2424

25-
# execfile() doesn't exist in Python 3, this way we are compatible with both.
26-
exec(compile(open('zerorpc/version.py').read(), 'zerorpc/version.py', 'exec'))
27-
2825
import sys
2926

27+
if sys.version_info < (3, 0):
28+
execfile('zerorpc/version.py')
29+
else:
30+
exec(compile(open('zerorpc/version.py', encoding='utf8').read(), 'zerorpc/version.py', 'exec'))
3031

3132
try:
3233
from setuptools import setup
@@ -35,13 +36,19 @@
3536

3637

3738
requirements = [
38-
'gevent>=1.0',
3939
'msgpack-python>=0.4.0',
40-
'pyzmq>=13.1.0'
40+
'pyzmq>=13.1.0',
41+
'future',
4142
]
43+
4244
if sys.version_info < (2, 7):
4345
requirements.append('argparse')
4446

47+
if sys.version_info < (3, 0):
48+
requirements.append('gevent>=1.0')
49+
else:
50+
requirements.append('gevent>=1.1rc5')
51+
4552

4653
setup(
4754
name='zerorpc',

‎tests/test_buffered_channel.py‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@
2323
# SOFTWARE.
2424

2525

26+
from __future__ import print_function
27+
from __future__ import absolute_import
28+
from builtins import range
29+
2630
from nose.tools import assert_raises
2731
import gevent
2832
import sys
2933

3034
from zerorpc import zmq
3135
import zerorpc
32-
from testutils import teardown, random_ipc_endpoint, TIME_FACTOR
36+
from .testutils import teardown, random_ipc_endpoint, TIME_FACTOR
3337

3438

3539
def test_close_server_bufchan():
@@ -54,14 +58,14 @@ def test_close_server_bufchan():
5458
server_bufchan.recv()
5559

5660
gevent.sleep(TIME_FACTOR * 3)
57-
print 'CLOSE SERVER SOCKET!!!'
61+
print('CLOSE SERVER SOCKET!!!')
5862
server_bufchan.close()
5963
if sys.version_info < (2, 7):
6064
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
6165
else:
6266
with assert_raises(zerorpc.LostRemote):
6367
client_bufchan.recv()
64-
print 'CLIENT LOST SERVER :)'
68+
print('CLIENT LOST SERVER :)')
6569
client_bufchan.close()
6670
server.close()
6771
client.close()
@@ -89,14 +93,14 @@ def test_close_client_bufchan():
8993
server_bufchan.recv()
9094

9195
gevent.sleep(TIME_FACTOR * 3)
92-
print 'CLOSE CLIENT SOCKET!!!'
96+
print('CLOSE CLIENT SOCKET!!!')
9397
client_bufchan.close()
9498
if sys.version_info < (2, 7):
9599
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
96100
else:
97101
with assert_raises(zerorpc.LostRemote):
98102
client_bufchan.recv()
99-
print 'SERVER LOST CLIENT :)'
103+
print('SERVER LOST CLIENT :)')
100104
server_bufchan.close()
101105
server.close()
102106
client.close()
@@ -122,14 +126,14 @@ def test_heartbeat_can_open_channel_server_close():
122126
server_bufchan = zerorpc.BufferedChannel(server_hbchan)
123127

124128
gevent.sleep(TIME_FACTOR * 3)
125-
print 'CLOSE SERVER SOCKET!!!'
129+
print('CLOSE SERVER SOCKET!!!')
126130
server_bufchan.close()
127131
if sys.version_info < (2, 7):
128132
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
129133
else:
130134
with assert_raises(zerorpc.LostRemote):
131135
client_bufchan.recv()
132-
print 'CLIENT LOST SERVER :)'
136+
print('CLIENT LOST SERVER :)')
133137
client_bufchan.close()
134138
server.close()
135139
client.close()
@@ -162,15 +166,15 @@ def server_fn():
162166
server_coro = gevent.spawn(server_fn)
163167

164168
gevent.sleep(TIME_FACTOR * 3)
165-
print 'CLOSE CLIENT SOCKET!!!'
169+
print('CLOSE CLIENT SOCKET!!!')
166170
client_bufchan.close()
167171
client.close()
168172
if sys.version_info < (2, 7):
169173
assert_raises(zerorpc.LostRemote, server_coro.get)
170174
else:
171175
with assert_raises(zerorpc.LostRemote):
172176
server_coro.get()
173-
print 'SERVER LOST CLIENT :)'
177+
print('SERVER LOST CLIENT :)')
174178
server.close()
175179

176180

@@ -189,7 +193,7 @@ def client_do():
189193
client_channel = client.channel()
190194
client_hbchan = zerorpc.HeartBeatOnChannel(client_channel, freq=TIME_FACTOR * 2)
191195
client_bufchan = zerorpc.BufferedChannel(client_hbchan)
192-
for x in xrange(20):
196+
for x in range(20):
193197
client_bufchan.emit('add', (x, x * x))
194198
event = client_bufchan.recv()
195199
assert event.name == 'OK'
@@ -205,7 +209,7 @@ def server_do():
205209
server_hbchan = zerorpc.HeartBeatOnChannel(server_channel, freq=TIME_FACTOR * 2)
206210
server_bufchan = zerorpc.BufferedChannel(server_hbchan)
207211

208-
for x in xrange(20):
212+
for x in range(20):
209213
event = server_bufchan.recv()
210214
assert event.name == 'add'
211215
server_bufchan.emit('OK', (sum(event.args),))
@@ -229,11 +233,11 @@ def test_do_some_req_rep_lost_server():
229233
client = zerorpc.ChannelMultiplexer(client_events, ignore_broadcast=True)
230234

231235
def client_do():
232-
print 'running'
236+
print('running')
233237
client_channel = client.channel()
234238
client_hbchan = zerorpc.HeartBeatOnChannel(client_channel, freq=TIME_FACTOR * 2)
235239
client_bufchan = zerorpc.BufferedChannel(client_hbchan)
236-
for x in xrange(10):
240+
for x in range(10):
237241
client_bufchan.emit('add', (x, x * x))
238242
event = client_bufchan.recv()
239243
assert event.name == 'OK'
@@ -254,7 +258,7 @@ def server_do():
254258
server_channel = server.channel(event)
255259
server_hbchan = zerorpc.HeartBeatOnChannel(server_channel, freq=TIME_FACTOR * 2)
256260
server_bufchan = zerorpc.BufferedChannel(server_hbchan)
257-
for x in xrange(10):
261+
for x in range(10):
258262
event = server_bufchan.recv()
259263
assert event.name == 'add'
260264
server_bufchan.emit('OK', (sum(event.args),))
@@ -282,7 +286,7 @@ def client_do():
282286
client_hbchan = zerorpc.HeartBeatOnChannel(client_channel, freq=TIME_FACTOR * 2)
283287
client_bufchan = zerorpc.BufferedChannel(client_hbchan)
284288

285-
for x in xrange(10):
289+
for x in range(10):
286290
client_bufchan.emit('add', (x, x * x))
287291
event = client_bufchan.recv()
288292
assert event.name == 'OK'
@@ -298,7 +302,7 @@ def server_do():
298302
server_hbchan = zerorpc.HeartBeatOnChannel(server_channel, freq=TIME_FACTOR * 2)
299303
server_bufchan = zerorpc.BufferedChannel(server_hbchan)
300304

301-
for x in xrange(10):
305+
for x in range(10):
302306
event = server_bufchan.recv()
303307
assert event.name == 'add'
304308
server_bufchan.emit('OK', (sum(event.args),))
@@ -334,15 +338,15 @@ def client_do():
334338

335339
if sys.version_info < (2, 7):
336340
def _do_with_assert_raises():
337-
for x in xrange(10):
341+
for x in range(10):
338342
client_bufchan.emit('sleep', (x,))
339343
event = client_bufchan.recv(timeout=TIME_FACTOR * 3)
340344
assert event.name == 'OK'
341345
assert list(event.args) == [x]
342346
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
343347
else:
344348
with assert_raises(zerorpc.TimeoutExpired):
345-
for x in xrange(10):
349+
for x in range(10):
346350
client_bufchan.emit('sleep', (x,))
347351
event = client_bufchan.recv(timeout=TIME_FACTOR * 3)
348352
assert event.name == 'OK'
@@ -360,15 +364,15 @@ def server_do():
360364

361365
if sys.version_info < (2, 7):
362366
def _do_with_assert_raises():
363-
for x in xrange(20):
367+
for x in range(20):
364368
event = server_bufchan.recv()
365369
assert event.name == 'sleep'
366370
gevent.sleep(TIME_FACTOR * event.args[0])
367371
server_bufchan.emit('OK', event.args)
368372
assert_raises(zerorpc.LostRemote, _do_with_assert_raises)
369373
else:
370374
with assert_raises(zerorpc.LostRemote):
371-
for x in xrange(20):
375+
for x in range(20):
372376
event = server_bufchan.recv()
373377
assert event.name == 'sleep'
374378
gevent.sleep(TIME_FACTOR * event.args[0])
@@ -399,7 +403,7 @@ def client_do():
399403
client_channel = client.channel()
400404
client_hbchan = zerorpc.HeartBeatOnChannel(client_channel, freq=TIME_FACTOR * 2)
401405
client_bufchan = zerorpc.BufferedChannel(client_hbchan, inqueue_size=100)
402-
for x in xrange(200):
406+
for x in range(200):
403407
event = client_bufchan.recv()
404408
assert event.name == 'coucou'
405409
assert event.args == x
@@ -416,24 +420,24 @@ def server_do():
416420
server_bufchan = zerorpc.BufferedChannel(server_hbchan, inqueue_size=100)
417421
if sys.version_info < (2, 7):
418422
def _do_with_assert_raises():
419-
for x in xrange(200):
423+
for x in range(200):
420424
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 1
421425
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
422426
else:
423427
with assert_raises(zerorpc.TimeoutExpired):
424-
for x in xrange(200):
428+
for x in range(200):
425429
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 1
426430
server_bufchan.emit('coucou', 1) # block until receiver is ready
427431
if sys.version_info < (2, 7):
428432
def _do_with_assert_raises():
429-
for x in xrange(2, 200):
433+
for x in range(2, 200):
430434
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 100
431435
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
432436
else:
433437
with assert_raises(zerorpc.TimeoutExpired):
434-
for x in xrange(2, 200):
438+
for x in range(2, 200):
435439
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 100
436-
for x in xrange(read_cnt.value, 200):
440+
for x in range(read_cnt.value, 200):
437441
server_bufchan.emit('coucou', x) # block until receiver is ready
438442
server_bufchan.close()
439443

‎tests/test_channel.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@
2323
# SOFTWARE.
2424

2525

26+
from __future__ import print_function
27+
from __future__ import absolute_import
28+
from builtins import range
29+
2630
from zerorpc import zmq
2731
import zerorpc
28-
from testutils import teardown, random_ipc_endpoint
32+
from .testutils import teardown, random_ipc_endpoint
2933

3034

3135
def test_events_channel_client_side():
@@ -42,12 +46,12 @@ def test_events_channel_client_side():
4246
client_channel.emit('someevent', (42,))
4347

4448
event = server.recv()
45-
print event
49+
print(event)
4650
assert list(event.args) == [42]
4751
assert event.identity is not None
4852

4953
reply_event = server.new_event('someanswer', (21,),
50-
xheader=dict(response_to=event.header['message_id']))
54+
xheader={'response_to': event.header['message_id']})
5155
reply_event.identity = event.identity
5256
server.emit_event(reply_event)
5357
event = client_channel.recv()
@@ -68,16 +72,16 @@ def test_events_channel_client_side_server_send_many():
6872
client_channel.emit('giveme', (10,))
6973

7074
event = server.recv()
71-
print event
75+
print(event)
7276
assert list(event.args) == [10]
7377
assert event.identity is not None
7478

75-
for x in xrange(10):
79+
for x in range(10):
7680
reply_event = server.new_event('someanswer', (x,),
77-
xheader=dict(response_to=event.header['message_id']))
81+
xheader={'response_to': event.header['message_id']})
7882
reply_event.identity = event.identity
7983
server.emit_event(reply_event)
80-
for x in xrange(10):
84+
for x in range(10):
8185
event = client_channel.recv()
8286
assert list(event.args) == [x]
8387

@@ -96,7 +100,7 @@ def test_events_channel_both_side():
96100
client_channel.emit('openthat', (42,))
97101

98102
event = server.recv()
99-
print event
103+
print(event)
100104
assert list(event.args) == [42]
101105
assert event.name == 'openthat'
102106

‎tests/test_client.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
# SOFTWARE.
2424

2525

26+
from __future__ import absolute_import
2627
import gevent
2728

2829
import zerorpc
29-
from testutils import teardown, random_ipc_endpoint
30+
from .testutils import teardown, random_ipc_endpoint
3031

3132
def test_client_connect():
3233
endpoint = random_ipc_endpoint()

0 commit comments

Comments
 (0)