diff --git a/rosapi/src/rosapi/params.py b/rosapi/src/rosapi/params.py index 564a50133..51565551c 100644 --- a/rosapi/src/rosapi/params.py +++ b/rosapi/src/rosapi/params.py @@ -108,7 +108,7 @@ def _set_param(node_name, name, value, parameter_type=None): try: # call_get_parameters will fail if node does not exist. call_set_parameters(node=_node, node_name=node_name, parameters=[parameter]) - except: + except Exception: pass @@ -138,7 +138,7 @@ def get_param(node_name, name, default, params_glob): # if type is 0 (parameter not set), the next line will raise an exception # and return value shall go to default. value = getattr(pvalue, _parameter_type_mapping[pvalue.type]) - except: + except Exception: # If either the node or the parameter does not exist, return default. value = default @@ -160,7 +160,7 @@ def has_param(node_name, name, params_glob): response = call_get_parameters( node=_node, node_name=node_name, parameter_names=[name]) - except: + except Exception: return False return response.values[0].type > 0 and response.values[0].type < len(_parameter_type_mapping) diff --git a/rosbridge_library/src/rosbridge_library/internal/message_conversion.py b/rosbridge_library/src/rosbridge_library/internal/message_conversion.py index 0fb0847e4..9c8dedff5 100644 --- a/rosbridge_library/src/rosbridge_library/internal/message_conversion.py +++ b/rosbridge_library/src/rosbridge_library/internal/message_conversion.py @@ -242,16 +242,10 @@ def _to_inst(msg, rostype, roottype, inst=None, stack=[]): def _to_binary_inst(msg): - if type(msg) in string_types: - try: - return standard_b64decode(msg) - except : - return msg - else: - try: - return bytes(bytearray(msg)) - except: - return msg + try: + return standard_b64decode(msg) if isinstance(msg, str) else bytes(bytearray(msg)) + except Exception: + return msg def _to_time_inst(msg, rostype, inst=None): diff --git a/rosbridge_library/src/rosbridge_library/internal/subscription_modifiers.py b/rosbridge_library/src/rosbridge_library/internal/subscription_modifiers.py index 20af2e572..55905ea35 100644 --- a/rosbridge_library/src/rosbridge_library/internal/subscription_modifiers.py +++ b/rosbridge_library/src/rosbridge_library/internal/subscription_modifiers.py @@ -153,12 +153,12 @@ def run(self): if self.alive and self.time_remaining() == 0 and len(self.queue) > 0: try: MessageHandler.handle_message(self, self.queue[0]) - except: + except Exception: pass del self.queue[0] while self.time_remaining() == 0 and len(self.queue) > 0: try: MessageHandler.handle_message(self, self.queue[0]) - except: + except Exception: pass del self.queue[0] diff --git a/rosbridge_library/src/rosbridge_library/protocol.py b/rosbridge_library/src/rosbridge_library/protocol.py index 50f16f4df..99139ecce 100644 --- a/rosbridge_library/src/rosbridge_library/protocol.py +++ b/rosbridge_library/src/rosbridge_library/protocol.py @@ -293,7 +293,7 @@ def serialize(self, msg, cid=None): return bson.BSON.encode(msg) else: return json.dumps(msg) - except: + except Exception: if cid is not None: # Only bother sending the log message if there's an id self.log("error", "Unable to serialize %s message to client" diff --git a/rosbridge_library/test/capabilities/test_subscribe.py b/rosbridge_library/test/capabilities/test_subscribe.py index 095d55cd7..9fb63421a 100755 --- a/rosbridge_library/test/capabilities/test_subscribe.py +++ b/rosbridge_library/test/capabilities/test_subscribe.py @@ -56,7 +56,7 @@ def test_update_params(self): self.assertEqual(subscription.queue_length, min_queue_length) self.assertEqual(subscription.fragment_size, min_frag_size) self.assertEqual(subscription.compression, "png") - except: + except: # noqa: E722 # Will unregister and raise subscription.unregister() raise diff --git a/rosbridge_library/test/internal/subscribers/test_subscription_modifiers.py b/rosbridge_library/test/internal/subscribers/test_subscription_modifiers.py index 2ab3a87d1..e6b93d9da 100755 --- a/rosbridge_library/test/internal/subscribers/test_subscription_modifiers.py +++ b/rosbridge_library/test/internal/subscribers/test_subscription_modifiers.py @@ -73,7 +73,7 @@ def cb(msg): try: self.assertEqual(["hello"] + list(range(990, 1000)), received["msgs"]) - except: + except: # noqa: E722 # Will finish and raise handler.finish() raise @@ -207,7 +207,7 @@ def cb(msg): for x in range(10): self.assertEqual(x, received["msg"]) time.sleep(throttle_rate_sec) - except: + except: # noqa: E722 # Will finish and raise handler.finish() raise diff --git a/rosbridge_library/test/internal/test_services.py b/rosbridge_library/test/internal/test_services.py index 4f2835a1d..103e04ddb 100755 --- a/rosbridge_library/test/internal/test_services.py +++ b/rosbridge_library/test/internal/test_services.py @@ -52,7 +52,7 @@ def callback(self, req): gen = populate_random_args(gen) try: rsp = c.populate_instance(gen, rsp) - except: + except: # noqa: E722 # Will print() and raise print("populating instance") print(rsp) print("populating with") diff --git a/rosbridge_server/src/rosbridge_server/websocket_handler.py b/rosbridge_server/src/rosbridge_server/websocket_handler.py index fc78224ba..96f90b145 100755 --- a/rosbridge_server/src/rosbridge_server/websocket_handler.py +++ b/rosbridge_server/src/rosbridge_server/websocket_handler.py @@ -163,7 +163,7 @@ def prewrite_message(self, message, binary): else: _log_exception() raise - except: + except: # noqa: E722 # Will log and raise _log_exception() raise