Skip to content

Commit fd879fd

Browse files
Make Kvaser error messages more readable.
1 parent d881677 commit fd879fd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

can/interfaces/kvaser/canlib.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,13 @@ def __init__(self, function, error_code, arguments):
7171
self.arguments = arguments
7272

7373
def __str__(self):
74-
return "function %s failed - %s - arguments were %s" % (self.function.__name__,
75-
self.__get_error_message(),
76-
self.arguments)
74+
return "Function %s failed - %s" % (self.function.__name__,
75+
self.__get_error_message())
7776

7877
def __get_error_message(self):
7978
errmsg = ctypes.create_string_buffer(128)
8079
canGetErrorText(self.error_code, errmsg, len(errmsg))
81-
return "%s (code %d)" % (errmsg.value, self.error_code)
80+
return errmsg.value.decode("ascii")
8281

8382

8483
def __convert_can_status_to_int(result):
@@ -117,7 +116,8 @@ def __handle_is_valid(handle):
117116

118117
def __check_bus_handle_validity(handle, function, arguments):
119118
if not __handle_is_valid(handle):
120-
raise CANLIBError(function, handle, arguments)
119+
result = __convert_can_status_to_int(handle)
120+
raise CANLIBError(function, result, arguments)
121121
else:
122122
return handle
123123

0 commit comments

Comments
 (0)