Move exception to exceptions.py

Author: christiansandberg

can/interfaces/vector/__init__.py

@@ -1,2 +1,2 @@
 from .canlib import VectorBus
-from .vxlapi import VectorError
+from .exceptions import VectorError

can/interfaces/vector/canlib.py

@@ -13,21 +13,18 @@
 # Import Modules
 # ==============
 from can import BusABC, Message
+from .exceptions import VectorError
 
 # Define Module Logger
 # ====================
 LOG = logging.getLogger(__name__)
 
 # Import safely Vector API module for Travis tests
-if sys.platform == 'win32':
-    try:
-        from . import vxlapi
-    except Exception as exc:
-        LOG.error('Could not import vxlapi: %s', exc)
-        vxlapi = None
-else:
-    LOG.warning('Vector API does not work on %s platform', sys.platform)
-    vxlapi = None
+vxlapi = None
+try:
+    from . import vxlapi
+except Exception as exc:
+    LOG.warning('Could not import vxlapi: %s', exc)
 
 
 class VectorBus(BusABC):
@@ -93,7 +90,7 @@ def __init__(self, channel, can_filters=None, poll_interval=0.01,
         try:
             vxlapi.xlActivateChannel(self.port_handle, self.mask,
                                      vxlapi.XL_BUS_TYPE_CAN, 0)
-        except vxlapi.VectorError:
+        except VectorError:
             self.shutdown()
             raise
         # Calculate time offset for absolute timestamps
@@ -114,7 +111,7 @@ def set_filters(self, can_filters=None):
                             self.port_handle, self.mask,
                             can_filter["can_id"], can_filter["can_mask"],
                             vxlapi.XL_CAN_EXT if can_filter.get("extended") else vxlapi.XL_CAN_STD)
-                    except vxlapi.VectorError as exc:
+                    except VectorError as exc:
                         LOG.warning("Could not set filters: %s", exc)
             else:
                 LOG.warning("Only one filter per extended or standard ID allowed")
@@ -126,7 +123,7 @@ def recv(self, timeout=None):
             event_count = ctypes.c_uint(1)
             try:
                 vxlapi.xlReceive(self.port_handle, event_count, event)
-            except vxlapi.VectorError as exc:
+            except VectorError as exc:
                 if exc.error_code != vxlapi.XL_ERR_QUEUE_IS_EMPTY:
                     raise
             else:

can/interfaces/vector/exceptions.py

@@ -0,0 +1,8 @@
+from can import CanError
+
+
+class VectorError(CanError):
+
+    def __init__(self, error_code, error_string):
+        self.error_code = error_code
+        super(VectorError, self).__init__(error_string)

can/interfaces/vector/vxlapi.py

@@ -8,7 +8,7 @@
 import ctypes
 import logging
 import platform
-from can import CanError
+from .exceptions import VectorError
 
 # Define Module Logger
 # ====================
@@ -17,12 +17,8 @@
 # Vector XL API Definitions
 # =========================
 # Load Windows DLL
-_xlapi_dll = None
-dll_name = 'vxlapi64' if platform.architecture()[0] == '64bit' else 'vxlapi'
-try:
-    _xlapi_dll = ctypes.windll.LoadLibrary(dll_name)
-except OSError:
-    raise ImportError('Cannot load Dynamic XL Driver Library')
+DLL_NAME = 'vxlapi64' if platform.architecture()[0] == '64bit' else 'vxlapi'
+_xlapi_dll = ctypes.windll.LoadLibrary(DLL_NAME)
 
 XL_BUS_TYPE_CAN = 0x00000001
 
@@ -73,20 +69,9 @@ class XLevent(ctypes.Structure):
 XLportHandle = ctypes.c_long
 
 
-class VectorError(CanError):
-
-    def __init__(self, function, error_code):
-        self.function = function
-        self.error_code = error_code
-
-    def __str__(self):
-        error_string = xlGetErrorString(self.error_code).decode()
-        return "Function %s failed: %s" % (self.function.__name__, error_string)
-
-
 def check_status(result, function, arguments):
     if result > 0:
-        raise VectorError(function, result)
+        raise VectorError(result, xlGetErrorString(result).decode())
     return result