From 91dd7efd565c75afc1df924eb7d1707c23a046b5 Mon Sep 17 00:00:00 2001 From: Felix Date: Wed, 9 Jun 2021 11:13:41 +0200 Subject: [PATCH 1/4] Supress exception occuring in NIXNET _detect_available_configs() --- can/interfaces/nixnet.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/can/interfaces/nixnet.py b/can/interfaces/nixnet.py index 993c215dd..4593bddb5 100644 --- a/can/interfaces/nixnet.py +++ b/can/interfaces/nixnet.py @@ -225,18 +225,23 @@ def shutdown(self): @staticmethod def _detect_available_configs(): configs = [] - nixnet_system = system.System() - for can_intf in nixnet_system.intf_refs_can: - logger.info("Channel index %d: %s", can_intf.port_num, str(can_intf)) - configs.append( - { - "interface": "nixnet", - "channel": str(can_intf), - "can_term_available": can_intf.can_term_cap - == constants.CanTermCap.YES, - } - ) - nixnet_system.close() + + try: + with system.System() as nixnet_system: + for interface in nixnet_system.intf_refs_can: + cahnnel = str(interface) + logger.debug("Found channel index %d: %s", interface.port_num, cahnnel) + configs.append( + { + "interface": "nixnet", + "channel": cahnnel, + "can_term_available": interface.can_term_cap + == constants.CanTermCap.YES, + } + ) + except XnetNotFoundError as error: + logger.debug("An error occured while searching for configs: %s", str(error)) + return configs From b964949da48f8f328d311307941033851176921e Mon Sep 17 00:00:00 2001 From: Felix Date: Wed, 9 Jun 2021 09:14:30 +0000 Subject: [PATCH 2/4] Format code with black --- can/interfaces/nixnet.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/can/interfaces/nixnet.py b/can/interfaces/nixnet.py index 4593bddb5..0bb9c3235 100644 --- a/can/interfaces/nixnet.py +++ b/can/interfaces/nixnet.py @@ -230,7 +230,9 @@ def _detect_available_configs(): with system.System() as nixnet_system: for interface in nixnet_system.intf_refs_can: cahnnel = str(interface) - logger.debug("Found channel index %d: %s", interface.port_num, cahnnel) + logger.debug( + "Found channel index %d: %s", interface.port_num, cahnnel + ) configs.append( { "interface": "nixnet", From 7520d215dca722437cfaf929d145464fd6619748 Mon Sep 17 00:00:00 2001 From: Felix Date: Wed, 9 Jun 2021 11:19:31 +0200 Subject: [PATCH 3/4] fix error import --- can/interfaces/nixnet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/can/interfaces/nixnet.py b/can/interfaces/nixnet.py index 4593bddb5..e7296dbab 100644 --- a/can/interfaces/nixnet.py +++ b/can/interfaces/nixnet.py @@ -19,7 +19,7 @@ if sys.platform == "win32": try: - from nixnet import session, types, constants, errors, system, database + from nixnet import session, types, constants, errors, system, database, XnetError except ImportError: logger.error("Error, NIXNET python module cannot be loaded.") raise ImportError() @@ -239,7 +239,7 @@ def _detect_available_configs(): == constants.CanTermCap.YES, } ) - except XnetNotFoundError as error: + except XnetError as error: logger.debug("An error occured while searching for configs: %s", str(error)) return configs From d61590daa5eae24249c46aaef69e012ad38a23a0 Mon Sep 17 00:00:00 2001 From: Felix Date: Wed, 9 Jun 2021 09:20:44 +0000 Subject: [PATCH 4/4] Format code with black --- can/interfaces/nixnet.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/can/interfaces/nixnet.py b/can/interfaces/nixnet.py index fd392840c..f50daf4c9 100644 --- a/can/interfaces/nixnet.py +++ b/can/interfaces/nixnet.py @@ -19,7 +19,15 @@ if sys.platform == "win32": try: - from nixnet import session, types, constants, errors, system, database, XnetError + from nixnet import ( + session, + types, + constants, + errors, + system, + database, + XnetError, + ) except ImportError: logger.error("Error, NIXNET python module cannot be loaded.") raise ImportError()