Rename to _UninitializedNetwork, use singleton instance.

christiansandberg · Aug 12, 2024 · 24560d0 · 24560d0
1 parent 378835e
commit 24560d0
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 20 deletions.
diff --git a/canopen/emcy.py b/canopen/emcy.py
@@ -85,7 +85,7 @@ def wait(
 class EmcyProducer:
 
     def __init__(self, cob_id: int):
-        self.network: canopen.network.Network = canopen.network._DummyNetwork()
+        self.network: canopen.network.Network = canopen.network._UNINITIALIZED_NETWORK
         self.cob_id = cob_id
 
     def send(self, code: int, register: int = 0, data: bytes = b""):

diff --git a/canopen/lss.py b/canopen/lss.py
@@ -82,7 +82,7 @@ class LssMaster:
     RESPONSE_TIMEOUT = 0.5
 
     def __init__(self) -> None:
-        self.network: canopen.network.Network = canopen.network._DummyNetwork()
+        self.network: canopen.network.Network = canopen.network._UNINITIALIZED_NETWORK
         self._node_id = 0
         self._data = None
         self.responses = queue.Queue()

diff --git a/canopen/network.py b/canopen/network.py
@@ -279,7 +279,7 @@ def __len__(self) -> int:
         return len(self.nodes)
 
 
-class _DummyNetwork(Network):
+class _UninitializedNetwork(Network):
     """Empty network implementation as a placeholder before actual initialization."""
 
     def __init__(self, bus: Optional[can.BusABC] = None):
@@ -290,6 +290,10 @@ def __getattribute__(self, name):
                            "try associating to a real network first.")
 
 
+#: Singleton instance
+_UNINITIALIZED_NETWORK = _UninitializedNetwork()
+
+
 class PeriodicMessageTask:
     """
     Task object to transmit a message periodically using python-can's

diff --git a/canopen/nmt.py b/canopen/nmt.py
@@ -51,7 +51,7 @@ class NmtBase:
 
     def __init__(self, node_id: int):
         self.id = node_id
-        self.network: canopen.network.Network = canopen.network._DummyNetwork()
+        self.network: canopen.network.Network = canopen.network._UNINITIALIZED_NETWORK
         self._state = 0
 
     def on_command(self, can_id, data, timestamp):

diff --git a/canopen/node/base.py b/canopen/node/base.py
@@ -19,7 +19,7 @@ def __init__(
         node_id: int,
         object_dictionary: Union[ObjectDictionary, str, TextIO],
     ):
-        self.network: canopen.network.Network = canopen.network._DummyNetwork()
+        self.network: canopen.network.Network = canopen.network._UNINITIALIZED_NETWORK
 
         if not isinstance(object_dictionary, ObjectDictionary):
             object_dictionary = import_od(object_dictionary, node_id)
@@ -29,4 +29,4 @@ def __init__(
 
     def has_network(self) -> bool:
         """Check whether the node has been associated to a network."""
-        return not isinstance(self.network, canopen.network._DummyNetwork)
+        return not isinstance(self.network, canopen.network._UninitializedNetwork)
diff --git a/canopen/node/local.py b/canopen/node/local.py
@@ -50,12 +50,12 @@ def associate_network(self, network: canopen.network.Network):
     def remove_network(self) -> None:
         self.network.unsubscribe(self.sdo.rx_cobid, self.sdo.on_request)
         self.network.unsubscribe(0, self.nmt.on_command)
-        self.network = canopen.network._DummyNetwork()
-        self.sdo.network = self.network
-        self.tpdo.network = self.network
-        self.rpdo.network = self.network
-        self.nmt.network = self.network
-        self.emcy.network = self.network
+        self.network = canopen.network._UNINITIALIZED_NETWORK
+        self.sdo.network = canopen.network._UNINITIALIZED_NETWORK
+        self.tpdo.network = canopen.network._UNINITIALIZED_NETWORK
+        self.rpdo.network = canopen.network._UNINITIALIZED_NETWORK
+        self.nmt.network = canopen.network._UNINITIALIZED_NETWORK
+        self.emcy.network = canopen.network._UNINITIALIZED_NETWORK
 
     def add_read_callback(self, callback):
         self._read_callbacks.append(callback)

diff --git a/canopen/node/remote.py b/canopen/node/remote.py
@@ -68,12 +68,12 @@ def remove_network(self) -> None:
         self.network.unsubscribe(0x700 + self.id, self.nmt.on_heartbeat)
         self.network.unsubscribe(0x80 + self.id, self.emcy.on_emcy)
         self.network.unsubscribe(0, self.nmt.on_command)
-        self.network = canopen.network._DummyNetwork()
-        self.sdo.network = self.network
-        self.pdo.network = self.network
-        self.tpdo.network = self.network
-        self.rpdo.network = self.network
-        self.nmt.network = self.network
+        self.network = canopen.network._UNINITIALIZED_NETWORK
+        self.sdo.network = canopen.network._UNINITIALIZED_NETWORK
+        self.pdo.network = canopen.network._UNINITIALIZED_NETWORK
+        self.tpdo.network = canopen.network._UNINITIALIZED_NETWORK
+        self.rpdo.network = canopen.network._UNINITIALIZED_NETWORK
+        self.nmt.network = canopen.network._UNINITIALIZED_NETWORK
 
     def add_sdo(self, rx_cobid, tx_cobid):
         """Add an additional SDO channel.

diff --git a/canopen/pdo/base.py b/canopen/pdo/base.py
@@ -30,7 +30,7 @@ class PdoBase(Mapping):
     """
 
     def __init__(self, node: Union[LocalNode, RemoteNode]):
-        self.network: canopen.network.Network = canopen.network._DummyNetwork()
+        self.network: canopen.network.Network = canopen.network._UNINITIALIZED_NETWORK
         self.map: Optional[PdoMaps] = None
         self.node: Union[LocalNode, RemoteNode] = node
 

diff --git a/canopen/sdo/base.py b/canopen/sdo/base.py
@@ -44,7 +44,7 @@ def __init__(
         """
         self.rx_cobid = rx_cobid
         self.tx_cobid = tx_cobid
-        self.network: canopen.network.Network = canopen.network._DummyNetwork()
+        self.network: canopen.network.Network = canopen.network._UNINITIALIZED_NETWORK
         self.od = od
 
     def __getitem__(