From 9bbce01ed4ff93b26b435d5ab356407d48c2a424 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 10 Dec 2023 11:25:08 +0100 Subject: Merging upstream version 2.3.1: - properly handles big-endian data in `iputils.py` (Closes: #1057031). Signed-off-by: Daniel Baumann --- stafd.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'stafd.py') diff --git a/stafd.py b/stafd.py index 0777405..6701499 100755 --- a/stafd.py +++ b/stafd.py @@ -88,7 +88,7 @@ if __name__ == '__main__': return STAF.tron @tron.setter - def tron(self, value): # pylint: disable=no-self-use + def tron(self, value): '''@brief Set Trace ON property''' STAF.tron = value @@ -108,21 +108,21 @@ if __name__ == '__main__': info.update(STAF.info()) return json.dumps(info) - def controller_info( # pylint: disable=no-self-use,too-many-arguments + def controller_info( # pylint: disable=too-many-arguments self, transport, traddr, trsvcid, subsysnqn, host_traddr, host_iface, host_nqn ) -> str: '''@brief D-Bus method used to return information about a controller''' controller = STAF.get_controller(transport, traddr, trsvcid, subsysnqn, host_traddr, host_iface, host_nqn) return json.dumps(controller.info()) if controller else '{}' - def get_log_pages( # pylint: disable=no-self-use,too-many-arguments + def get_log_pages( # pylint: disable=too-many-arguments self, transport, traddr, trsvcid, subsysnqn, host_traddr, host_iface, host_nqn ) -> list: '''@brief D-Bus method used to retrieve the discovery log pages from one controller''' controller = STAF.get_controller(transport, traddr, trsvcid, subsysnqn, host_traddr, host_iface, host_nqn) return controller.log_pages() if controller else list() - def get_all_log_pages(self, detailed) -> str: # pylint: disable=no-self-use + def get_all_log_pages(self, detailed) -> str: '''@brief D-Bus method used to retrieve the discovery log pages from all controllers''' log_pages = list() for controller in STAF.get_controllers(): @@ -134,7 +134,7 @@ if __name__ == '__main__': ) return json.dumps(log_pages) - def list_controllers(self, detailed) -> list: # pylint: disable=no-self-use + def list_controllers(self, detailed) -> list: '''@brief Return the list of discovery controller IDs''' return [ controller.details() if detailed else controller.controller_id_dict() -- cgit v1.2.3