Merge branch 'develop' into dev/ixxat_666kbit

hardbyte · web-flow · commit a801b4328502 · 2020-10-14T14:50:13.000+13:00
diff --git a/can/interfaces/seeedstudio/seeedstudio.py b/can/interfaces/seeedstudio/seeedstudio.py
@@ -8,6 +8,7 @@
 
 import logging
 import struct
+import io
 from time import time
 from can import BusABC, Message
 
@@ -262,7 +263,7 @@ def _recv_internal(self, timeout):
         return None, None
 
     def fileno(self):
-        if hasattr(self.ser, "fileno"):
+        try:
             return self.ser.fileno()
-        # Return an invalid file descriptor on Windows
-        return -1
+        except io.UnsupportedOperation:
+            raise NotImplementedError("fileno is not implemented using current CAN bus")
diff --git a/can/notifier.py b/can/notifier.py
@@ -158,7 +158,7 @@ def add_listener(self, listener: Listener):
 
     def remove_listener(self, listener: Listener):
         """Remove a listener from the notification list. This method
-        trows an exception if the given listener is not part of the
+        throws an exception if the given listener is not part of the
         stored listeners.
 
         :param listener: Listener to be removed from the list to be notified
