From 2ce373b0da7954b50b5793aa3d790205458dd9cc Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 30 Dec 2020 22:53:15 +0100
Subject: [PATCH] distributed: Assorted error fixes

---
 direct/src/distributed/DistributedCartesianGridAI.py | 2 +-
 direct/src/distributed/DistributedNodeUD.py          | 2 +-
 direct/src/distributed/DoCollectionManager.py        | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/direct/src/distributed/DistributedCartesianGridAI.py b/direct/src/distributed/DistributedCartesianGridAI.py
index 2ad2983aa1..370906cccc 100755
--- a/direct/src/distributed/DistributedCartesianGridAI.py
+++ b/direct/src/distributed/DistributedCartesianGridAI.py
@@ -97,7 +97,7 @@ class DistributedCartesianGridAI(DistributedNodeAI, CartesianGridBase):
     def updateGridTask(self, task=None):
         # Run through all grid objects and update their parents if needed
         missingObjs = []
-        for avId in self.gridObjects.keys():
+        for avId in list(self.gridObjects.keys()):
             av = self.gridObjects[avId]
             # handle a missing object after it is already gone?
             if (av.isEmpty()):
diff --git a/direct/src/distributed/DistributedNodeUD.py b/direct/src/distributed/DistributedNodeUD.py
index 39c0489f5e..2c83b21c07 100755
--- a/direct/src/distributed/DistributedNodeUD.py
+++ b/direct/src/distributed/DistributedNodeUD.py
@@ -26,7 +26,7 @@ class DistributedNodeUD(DistributedObjectUD):
 
     def setParentStr(self, parentToken):
         self.notify.debugCall()
-        if len(parentTokenStr) > 0:
+        if len(parentToken) > 0:
             self.do_setParent(parentToken)
 
     def setParent(self, parentToken):
diff --git a/direct/src/distributed/DoCollectionManager.py b/direct/src/distributed/DoCollectionManager.py
index 9dbf794dce..f36aedb6d9 100755
--- a/direct/src/distributed/DoCollectionManager.py
+++ b/direct/src/distributed/DoCollectionManager.py
@@ -270,9 +270,7 @@ class DoCollectionManager:
 
     def deleteDistributedObjects(self):
         # Get rid of all the distributed objects
-        for doId in self.doId2do.keys():
-            # Look up the object
-            do = self.doId2do[doId]
+        for doId, do in list(self.doId2do.items()):
             self.deleteDistObject(do)
 
         # Get rid of everything that manages distributed objects