Clean up imports ordering.

Follow recommendations from flake8 regarding import order and
grouping.  Put two blank lines after the top import block in each
file.

Import CanError directly from can package in canopen.sdo.client
instead of from canopen.network, where it was not even used.

Author: acolomb

canopen/__init__.py

@@ -1,8 +1,14 @@
 from canopen.network import Network, NodeScanner
-from canopen.node import RemoteNode, LocalNode
-from canopen.sdo import SdoCommunicationError, SdoAbortedError
-from canopen.objectdictionary import import_od, export_od, ObjectDictionary, ObjectDictionaryError
+from canopen.node import LocalNode, RemoteNode
+from canopen.objectdictionary import (
+    ObjectDictionary,
+    ObjectDictionaryError,
+    export_od,
+    import_od,
+)
 from canopen.profiles.p402 import BaseNode402
+from canopen.sdo import SdoAbortedError, SdoCommunicationError
+
 try:
     from canopen._version import version as __version__
 except ImportError:

canopen/emcy.py

@@ -1,5 +1,5 @@
-import struct
 import logging
+import struct
 import threading
 import time
 from typing import Callable, List, Optional

canopen/lss.py

@@ -1,7 +1,7 @@
 import logging
-import time
-import struct
 import queue
+import struct
+import time
 
 import canopen.network
 

canopen/network.py

@@ -1,21 +1,21 @@
 from __future__ import annotations
 
-from collections.abc import MutableMapping
 import logging
 import threading
+from collections.abc import MutableMapping
 from typing import Callable, Dict, Final, Iterator, List, Optional, Union
 
 import can
 from can import Listener
-from can import CanError
 
-from canopen.node import RemoteNode, LocalNode
-from canopen.sync import SyncProducer
-from canopen.timestamp import TimeProducer
-from canopen.nmt import NmtMaster
 from canopen.lss import LssMaster
-from canopen.objectdictionary.eds import import_from_node
+from canopen.nmt import NmtMaster
+from canopen.node import LocalNode, RemoteNode
 from canopen.objectdictionary import ObjectDictionary
+from canopen.objectdictionary.eds import import_from_node
+from canopen.sync import SyncProducer
+from canopen.timestamp import TimeProducer
+
 
 logger = logging.getLogger(__name__)
 

canopen/nmt.py

@@ -1,6 +1,6 @@
-import threading
 import logging
 import struct
+import threading
 import time
 from typing import Callable, Optional, TYPE_CHECKING
 

canopen/node/__init__.py

@@ -1,2 +1,2 @@
-from canopen.node.remote import RemoteNode
 from canopen.node.local import LocalNode
+from canopen.node.remote import RemoteNode

canopen/node/local.py

@@ -4,13 +4,14 @@
 from typing import Dict, Union
 
 import canopen.network
-from canopen.node.base import BaseNode
-from canopen.sdo import SdoServer, SdoAbortedError
-from canopen.pdo import PDO, TPDO, RPDO
-from canopen.nmt import NmtSlave
+from canopen import objectdictionary
 from canopen.emcy import EmcyProducer
+from canopen.nmt import NmtSlave
+from canopen.node.base import BaseNode
 from canopen.objectdictionary import ObjectDictionary
-from canopen import objectdictionary
+from canopen.pdo import PDO, RPDO, TPDO
+from canopen.sdo import SdoAbortedError, SdoServer
+
 
 logger = logging.getLogger(__name__)
 

canopen/node/remote.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
 import logging
-from typing import Union, TextIO
+from typing import TextIO, Union
 
 import canopen.network
-from canopen.sdo import SdoClient, SdoCommunicationError, SdoAbortedError
-from canopen.nmt import NmtMaster
 from canopen.emcy import EmcyConsumer
-from canopen.pdo import TPDO, RPDO, PDO
-from canopen.objectdictionary import ODRecord, ODArray, ODVariable, ObjectDictionary
+from canopen.nmt import NmtMaster
 from canopen.node.base import BaseNode
+from canopen.objectdictionary import ODArray, ODRecord, ODVariable, ObjectDictionary
+from canopen.pdo import PDO, RPDO, TPDO
+from canopen.sdo import SdoAbortedError, SdoClient, SdoCommunicationError
+
 
 logger = logging.getLogger(__name__)
 

canopen/objectdictionary/__init__.py

@@ -1,17 +1,19 @@
 """
 Object Dictionary module
 """
+
 from __future__ import annotations
 
+import logging
 import struct
+from collections.abc import Mapping, MutableMapping
 from typing import Dict, Iterator, List, Optional, TextIO, Union
-from collections.abc import MutableMapping, Mapping
-import logging
 
 from canopen.objectdictionary.datatypes import *
 from canopen.objectdictionary.datatypes import IntegerN, UnsignedN
 from canopen.utils import pretty_index
 
+
 logger = logging.getLogger(__name__)
 
 

canopen/objectdictionary/datatypes.py

@@ -1,5 +1,6 @@
 import struct
 
+
 BOOLEAN = 0x1
 INTEGER8 = 0x2
 INTEGER16 = 0x3