Converting vector interface argument to lowercase

pierreluctg · pierreluctg · commit 49bd764731ac · 2020-06-16T08:54:06.000-04:00
Variable name should be lowercase, with words separated by underscores as necessary to improve readability. (PEP8)

Current CamelCase arguments cannot be set from the configuration file since the variables are read as lowercase.
diff --git a/can/interfaces/vector/canlib.py b/can/interfaces/vector/canlib.py
@@ -63,12 +63,12 @@ def __init__(
         serial=None,
         fd=False,
         data_bitrate=None,
-        sjwAbr=2,
-        tseg1Abr=6,
-        tseg2Abr=3,
-        sjwDbr=2,
-        tseg1Dbr=6,
-        tseg2Dbr=3,
+        sjw_abr=2,
+        tseg1_abr=6,
+        tseg2_abr=3,
+        sjw_dbr=2,
+        tseg1_dbr=6,
+        tseg2_dbr=3,
         **kwargs,
     ):
         """
@@ -219,16 +219,16 @@ def __init__(
                     self.canFdConf.arbitrationBitRate = ctypes.c_uint(bitrate)
                 else:
                     self.canFdConf.arbitrationBitRate = ctypes.c_uint(500000)
-                self.canFdConf.sjwAbr = ctypes.c_uint(sjwAbr)
-                self.canFdConf.tseg1Abr = ctypes.c_uint(tseg1Abr)
-                self.canFdConf.tseg2Abr = ctypes.c_uint(tseg2Abr)
+                self.canFdConf.sjwAbr = ctypes.c_uint(sjw_abr)
+                self.canFdConf.tseg1Abr = ctypes.c_uint(tseg1_abr)
+                self.canFdConf.tseg2Abr = ctypes.c_uint(tseg2_abr)
                 if data_bitrate:
                     self.canFdConf.dataBitRate = ctypes.c_uint(data_bitrate)
                 else:
                     self.canFdConf.dataBitRate = self.canFdConf.arbitrationBitRate
-                self.canFdConf.sjwDbr = ctypes.c_uint(sjwDbr)
-                self.canFdConf.tseg1Dbr = ctypes.c_uint(tseg1Dbr)
-                self.canFdConf.tseg2Dbr = ctypes.c_uint(tseg2Dbr)
+                self.canFdConf.sjwDbr = ctypes.c_uint(sjw_dbr)
+                self.canFdConf.tseg1Dbr = ctypes.c_uint(tseg1_dbr)
+                self.canFdConf.tseg2Dbr = ctypes.c_uint(tseg2_dbr)
 
                 xldriver.xlCanFdSetConfiguration(
                     self.port_handle, self.mask, self.canFdConf
diff --git a/test/test_vector.py b/test/test_vector.py
@@ -6,10 +6,8 @@
 """
 
 import ctypes
-import pickle
-import time
-import logging
 import os
+import pickle
 import unittest
 from unittest.mock import Mock
 
@@ -131,12 +129,12 @@ def test_bus_creation_fd_bitrate_timings(self) -> None:
             fd=True,
             bitrate=500000,
             data_bitrate=2000000,
-            sjwAbr=10,
-            tseg1Abr=11,
-            tseg2Abr=12,
-            sjwDbr=13,
-            tseg1Dbr=14,
-            tseg2Dbr=15,
+            sjw_abr=10,
+            tseg1_abr=11,
+            tseg2_abr=12,
+            sjw_dbr=13,
+            tseg1_dbr=14,
+            tseg2_dbr=15,
             _testing=True,
         )
         self.assertIsInstance(self.bus, canlib.VectorBus)
