Fix channel2int conversion (#1269)

* make regex dot non-greedy

* Update test/test_util.py

Co-authored-by: Felix Divo <[email protected]>

Co-authored-by: Felix Divo <[email protected]>

Author: zariiii9003

can/util.py

@@ -292,7 +292,7 @@ def channel2int(channel: Optional[typechecking.Channel]) -> Optional[int]:
     if isinstance(channel, int):
         return channel
     if isinstance(channel, str):
-        match = re.match(r".*(\d+)$", channel)
+        match = re.match(r".*?(\d+)$", channel)
         if match:
             return int(match.group(1))
     return None

test/test_util.py

@@ -3,7 +3,7 @@
 import unittest
 import warnings
 
-from can.util import _create_bus_config, _rename_kwargs
+from can.util import _create_bus_config, _rename_kwargs, channel2int
 
 
 class RenameKwargsTest(unittest.TestCase):
@@ -64,3 +64,15 @@ def test_timing_can_use_int(self):
             _create_bus_config({**self.base_config, **timing_conf})
         except TypeError as e:
             self.fail(e)
+
+
+class TestChannel2Int(unittest.TestCase):
+    def test_channel2int(self) -> None:
+        self.assertEqual(0, channel2int("can0"))
+        self.assertEqual(0, channel2int("vcan0"))
+        self.assertEqual(1, channel2int("vcan1"))
+        self.assertEqual(12, channel2int("vcan12"))
+        self.assertEqual(3, channel2int(3))
+        self.assertEqual(42, channel2int("42"))
+        self.assertEqual(None, channel2int("can"))
+        self.assertEqual(None, channel2int("can0a"))