Skip to content

Commit 213d94e

Browse files
aluzzardibombela
aluzzardi
authored and
bombela
committed
pep8 police
Conflicts: zerorpc/gevent_zmq.py -> a simple comment modification.
1 parent 508234e commit 213d94e

14 files changed

+81
-51
lines changed

‎bin/zerorpc-client‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ parser.add_argument('command', nargs='?',
7474
python module/class to load if --server. If no command is \
7575
specified, a list of remote methods are displayed.')
7676
parser.add_argument('params', nargs='*',
77-
help='parameters for the remote call if --client (default)')
77+
help='parameters for the remote call if --client \
78+
(default)')
7879

7980

8081
def setup_links(args, socket):
@@ -91,6 +92,7 @@ def setup_links(args, socket):
9192
print 'connecting to "{0}"'.format(endpoint)
9293
socket.connect(endpoint)
9394

95+
9496
def run_server(args):
9597
server_obj_path = args.command
9698

@@ -109,17 +111,18 @@ def run_server(args):
109111
print 'serving "{0}"'.format(server_obj_path)
110112
return server.run()
111113

114+
112115
# this function does a really intricate job to keep backward compatibility
113-
# with a previous version of zerorpc, and lazily retrieving results if possible...
116+
# with a previous version of zerorpc, and lazily retrieving results if possible
114117
def zerorpc_inspect(client, method=None, long_doc=True, include_argspec=True):
115118
try:
116119
remote_detailled_methods = client._zerorpc_inspect(method,
117120
long_doc)['methods']
118121

119122
if include_argspec:
120123
r = [(name + (inspect.formatargspec(*argspec) if argspec else
121-
'(...)'), doc if doc else '<undocumented>') for name, argspec, doc
122-
in remote_detailled_methods]
124+
'(...)'), doc if doc else '<undocumented>')
125+
for name, argspec, doc in remote_detailled_methods]
123126
else:
124127
r = [(name, doc if doc else '<undocumented>')
125128
for name, argspec, doc in remote_detailled_methods]
@@ -150,11 +153,13 @@ def zerorpc_inspect(client, method=None, long_doc=True, include_argspec=True):
150153
return (longest_name_len, ((name, doc) for name, argspec, doc in
151154
remote_detailled_methods()))
152155

153-
r = [(name + (inspect.formatargspec(*argspec) if argspec else '(...)'), doc)
156+
r = [(name + (inspect.formatargspec(*argspec)
157+
if argspec else '(...)'), doc)
154158
for name, argspec, doc in remote_detailled_methods()]
155159
longest_name_len = max(len(name) for name, doc in r)
156160
return (longest_name_len, r)
157161

162+
158163
def run_client(args):
159164
client = zerorpc.Client(timeout=args.timeout, heartbeat=args.heartbeat,
160165
passive_heartbeat=not args.active_hb)
@@ -201,6 +206,7 @@ def run_client(args):
201206
for result in results:
202207
pprint(result)
203208

209+
204210
def main():
205211
args = parser.parse_args()
206212
if args.bind or args.connect:

‎setup.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@
3131

3232

3333
setup(
34-
name = 'zerorpc',
35-
version = zerorpc.__version__,
36-
description = 'zerorpc is a flexible RPC based on zeromq.',
37-
author = zerorpc.__author__,
38-
url = 'https://github.com/dotcloud/zerorpc-python',
39-
packages = ['zerorpc'],
40-
install_requires = [
34+
name='zerorpc',
35+
version=zerorpc.__version__,
36+
description='zerorpc is a flexible RPC based on zeromq.',
37+
author=zerorpc.__author__,
38+
url='https://github.com/dotcloud/zerorpc-python',
39+
packages=['zerorpc'],
40+
install_requires=[
4141
'argparse',
4242
'gevent',
4343
'msgpack-python',
4444
'pyzmq-static==2.1.7',
4545
],
46-
zip_safe = False,
47-
scripts = [
46+
zip_safe=False,
47+
scripts=[
4848
'bin/zerorpc-client'
4949
],
50-
license = 'MIT',
50+
license='MIT',
5151
classifiers=(
5252
'Development Status :: 5 - Production/Stable',
5353
'Intended Audience :: Developers',

‎tests/test_client_heartbeat.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
# SOFTWARE.
2424

2525

26-
from nose.tools import assert_raises
2726
import gevent
2827

29-
from zerorpc import zmq
3028
import zerorpc
3129

30+
3231
def test_client_server_hearbeat():
3332
endpoint = 'ipc://test_client_server_hearbeat'
3433

‎tests/test_events.py‎

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

2525

26-
from nose.tools import assert_raises
27-
import gevent
28-
2926
from zerorpc import zmq
3027
import zerorpc
3128

29+
3230
class MokupContext():
3331
_next_id = 0
32+
3433
def new_msgid(self):
3534
new_id = MokupContext._next_id
3635
MokupContext._next_id += 1
3736
return new_id
3837

38+
3939
def test_context():
4040
c = zerorpc.Context()
4141
assert c.new_msgid() is not None
4242

43+
4344
def test_event():
4445
context = MokupContext()
4546
event = zerorpc.Event('mylittleevent', (None,), context=context)
@@ -89,6 +90,7 @@ def test_event():
8990
event.header.update({'stream': True})
9091
assert event.header['stream'] is True
9192

93+
9294
def test_events_req_rep():
9395
endpoint = 'ipc://test_events_req_rep'
9496
server = zerorpc.Events(zmq.REP)
@@ -104,6 +106,7 @@ def test_events_req_rep():
104106
assert event.name == 'myevent'
105107
assert event.args == ('arg1',)
106108

109+
107110
def test_events_req_rep2():
108111
endpoint = 'ipc://test_events_req_rep2'
109112
server = zerorpc.Events(zmq.REP)
@@ -125,6 +128,7 @@ def test_events_req_rep2():
125128
assert event.name == 'answser' + str(i * 2)
126129
assert event.args == (i * 2,)
127130

131+
128132
def test_events_dealer_router():
129133
endpoint = 'ipc://test_events_dealer_router'
130134
server = zerorpc.Events(zmq.XREP)
@@ -147,6 +151,7 @@ def test_events_dealer_router():
147151
assert event.name == 'answser' + str(i * 2)
148152
assert event.args == (i * 2,)
149153

154+
150155
def test_events_push_pull():
151156
endpoint = 'ipc://test_events_push_pull'
152157
server = zerorpc.Events(zmq.PULL)
@@ -164,6 +169,7 @@ def test_events_push_pull():
164169
assert event.name == 'myevent'
165170
assert event.args == (x,)
166171

172+
167173
def test_events_channel_client_side():
168174
endpoint = 'ipc://test_events_channel_client_side'
169175
server_events = zerorpc.Events(zmq.XREP)

‎tests/test_middleware.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from zerorpc import zmq
3030
import zerorpc
3131

32+
3233
def test_resolve_endpoint():
3334
test_endpoint = 'ipc://test_resolve_endpoint'
3435
c = zerorpc.Context()
@@ -72,6 +73,7 @@ def resolve_endpoint(self, endpoint):
7273
print 'resolve toto:', c2.middleware_resolve_endpoint('toto')
7374
assert c2.middleware_resolve_endpoint('toto') == 'toto'
7475

76+
7577
def test_resolve_endpoint_events():
7678
test_endpoint = 'ipc://test_resolve_endpoint_events'
7779
c = zerorpc.Context()
@@ -87,8 +89,6 @@ def hello(self):
8789
print 'heee'
8890
return 'world'
8991

90-
91-
9292
srv = Srv(heartbeat=1, context=c)
9393
with assert_raises(zmq.ZMQError):
9494
srv.bind('some_service')
@@ -105,6 +105,7 @@ def hello(self):
105105
client.close()
106106
srv.close()
107107

108+
108109
def test_raise_error():
109110
endpoint = 'ipc://test_raise_error'
110111
c = zerorpc.Context()

‎tests/test_pubpush.py‎

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

2525

26-
from nose.tools import assert_raises
2726
import gevent
2827
import gevent.event
2928

30-
from zerorpc import zmq
3129
import zerorpc
3230

31+
3332
def test_pushpull():
3433
endpoint = 'ipc://test_pushpull'
3534

@@ -52,6 +51,7 @@ def lolita(self, a, b):
5251
trigger.wait()
5352
print 'done'
5453

54+
5555
def test_pubsub():
5656
endpoint = 'ipc://test_pubsub'
5757

‎tests/test_reqstream.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
# SOFTWARE.
2424

2525

26-
from nose.tools import assert_raises
2726
import gevent
2827

29-
from zerorpc import zmq
3028
import zerorpc
3129

30+
3231
def test_rcp_streaming():
3332
endpoint = 'ipc://test_rcp_streaming'
3433

‎tests/test_server.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from zerorpc import zmq
3030
import zerorpc
3131

32+
3233
def test_server_manual():
3334
endpoint = 'ipc://test_server_manual'
3435

@@ -61,6 +62,7 @@ def add(self, a, b):
6162
client_channel.close()
6263
srv.stop()
6364

65+
6466
def test_client_server():
6567
endpoint = 'ipc://test_client_server'
6668

@@ -110,6 +112,7 @@ def add(self, a, b):
110112
client.close()
111113
srv.close()
112114

115+
113116
def test_client_server_exception():
114117
endpoint = 'ipc://test_client_server_exception'
115118

@@ -131,6 +134,7 @@ def raise_something(self, a):
131134
client.close()
132135
srv.close()
133136

137+
134138
def test_client_server_detailed_exception():
135139
endpoint = 'ipc://test_client_server_detailed_exception'
136140

@@ -160,6 +164,7 @@ def raise_error(self):
160164
client.close()
161165
srv.close()
162166

167+
163168
def test_exception_compat_v1():
164169
endpoint = 'ipc://test_exception_compat_v1'
165170

‎tests/test_socket_on_channel.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_close_server_socket():
4747
event = server.recv()
4848
server_channel = server.channel(event)
4949
server_socket = zerorpc.SocketOnChannel(server_channel, heartbeat=1)
50-
open_event = server_socket.recv()
50+
server_socket.recv()
5151

5252
gevent.sleep(3)
5353
print 'CLOSE SERVER SOCKET!!!'
@@ -79,7 +79,7 @@ def test_close_client_socket():
7979
event = server.recv()
8080
server_channel = server.channel(event)
8181
server_socket = zerorpc.SocketOnChannel(server_channel, heartbeat=1)
82-
open_event = server_socket.recv()
82+
server_socket.recv()
8383

8484
gevent.sleep(3)
8585
print 'CLOSE CLIENT SOCKET!!!'
@@ -153,6 +153,7 @@ def test_heartbeat_can_open_channel_client_close():
153153
server_channel.close()
154154
server.close()
155155

156+
156157
def test_do_some_req_rep():
157158
endpoint = 'ipc://test_do_some_req_rep'
158159
server_events = zerorpc.Events(zmq.XREP)
@@ -336,9 +337,11 @@ def server_do():
336337
client.close()
337338
server.close()
338339

340+
339341
class CongestionError(Exception):
340342
pass
341343

344+
342345
def test_congestion_control_server_pushing():
343346
endpoint = 'ipc://test_congestion_control_server_pushing'
344347
server_events = zerorpc.Events(zmq.XREP)

‎tests/test_wrapped_events.py‎

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

2525

26-
from nose.tools import assert_raises
27-
import gevent
2826
import random
2927

3028
from zerorpc import zmq
3129
import zerorpc
3230

31+
3332
def test_sub_events():
3433
endpoint = 'ipc://test_sub_events'
3534
server_events = zerorpc.Events(zmq.XREP)
@@ -61,6 +60,7 @@ def test_sub_events():
6160
server_events.close()
6261
client_events.close()
6362

63+
6464
def test_multiple_sub_events():
6565
endpoint = 'ipc://test_multiple_sub_events'
6666
server_events = zerorpc.Events(zmq.XREP)
@@ -92,7 +92,6 @@ def test_multiple_sub_events():
9292
assert event.name == 'coucou1'
9393
assert event.args == 43
9494

95-
9695
event = server.recv()
9796
print event
9897
assert type(event.args) is str
@@ -114,6 +113,7 @@ def test_multiple_sub_events():
114113
server_events.close()
115114
client_events.close()
116115

116+
117117
def test_recursive_multiplexer():
118118
endpoint = 'ipc://test_recursive_multiplexer'
119119

@@ -123,7 +123,8 @@ def test_recursive_multiplexer():
123123

124124
client_events = zerorpc.Events(zmq.XREQ)
125125
client_events.connect(endpoint)
126-
clientmux = zerorpc.ChannelMultiplexer(client_events, ignore_broadcast=True)
126+
clientmux = zerorpc.ChannelMultiplexer(client_events,
127+
ignore_broadcast=True)
127128

128129
def ping_pong(climux, srvmux):
129130
cli_chan = climux.channel()
@@ -146,7 +147,8 @@ def ping_pong(climux, srvmux):
146147
srv_chan.close()
147148
cli_chan.close()
148149

149-
def create_sub_multiplexer(events, from_event=None, ignore_broadcast=False):
150+
def create_sub_multiplexer(events, from_event=None,
151+
ignore_broadcast=False):
150152
channel = events.channel(from_event)
151153
sub_events = zerorpc.WrappedEvents(channel)
152154
sub_multiplexer = zerorpc.ChannelMultiplexer(sub_events,

0 commit comments

Comments
 (0)