diff --git a/tox.ini b/tox.ini index 96bace8..54df224 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,6 @@ commands = passenv = ZPC_TEST_TIME_FACTOR [flake8] -ignore = E501,E128 +ignore = E501,E128,W503 filename = *.py,zerorpc exclude = tests,.git,dist,doc,*.egg-info,__pycache__,setup.py diff --git a/zerorpc/channel.py b/zerorpc/channel.py index ad21c27..5973b35 100644 --- a/zerorpc/channel.py +++ b/zerorpc/channel.py @@ -232,7 +232,7 @@ def emit_event(self, event, timeout=None): self._remote_queue_open_slots -= 1 try: self._channel.emit_event(event) - except: + except Exception: self._remote_queue_open_slots += 1 raise diff --git a/zerorpc/core.py b/zerorpc/core.py index 9dbf5cc..6e7a6a2 100644 --- a/zerorpc/core.py +++ b/zerorpc/core.py @@ -78,8 +78,8 @@ def _filter_methods(cls, self, methods): server_methods = set(k for k in dir(cls) if not k.startswith('_')) return dict((k, getattr(methods, k)) for k in dir(methods) - if callable(getattr(methods, k)) and - not k.startswith('_') and k not in server_methods + if callable(getattr(methods, k)) + and not k.startswith('_') and k not in server_methods ) @staticmethod @@ -268,8 +268,8 @@ def __call__(self, method, *args, **kargs): # In python 3.7, "async" is a reserved keyword, clients should now use # "async_": support both for the time being - if (kargs.get('async', False) is False and - kargs.get('async_', False) is False): + if (kargs.get('async', False) is False + and kargs.get('async_', False) is False): return self._process_response(request_event, bufchan, timeout) async_result = gevent.event.AsyncResult() diff --git a/zerorpc/events.py b/zerorpc/events.py index f87d0b5..9d909f9 100644 --- a/zerorpc/events.py +++ b/zerorpc/events.py @@ -67,13 +67,13 @@ def _send(self, parts): for i in range(len(parts) - 1): try: self._socket.send(parts[i], copy=False, flags=zmq.SNDMORE) - except (gevent.GreenletExit, gevent.Timeout) as e: + except (gevent.GreenletExit, gevent.Timeout): if i == 0: raise self._socket.send(parts[i], copy=False, flags=zmq.SNDMORE) try: self._socket.send(parts[-1], copy=False) - except (gevent.GreenletExit, gevent.Timeout) as e: + except (gevent.GreenletExit, gevent.Timeout): self._socket.send(parts[-1], copy=False) if e: raise e @@ -97,7 +97,7 @@ def _recv(self): while True: try: part = self._socket.recv(copy=False) - except (gevent.GreenletExit, gevent.Timeout) as e: + except (gevent.GreenletExit, gevent.Timeout): if len(parts) == 0: raise part = self._socket.recv(copy=False)