Browse Source

fixed getTasks and getDoLaters to exclude removed tasks, renamed stepping() to setStepping() so it isn't overwritten by 'stepping' instance member variable

Darren Ranalli 17 years ago
parent
commit
d594cb7dde
1 changed files with 6 additions and 4 deletions
  1. 6 4
      direct/src/task/Task.py

+ 6 - 4
direct/src/task/Task.py

@@ -402,7 +402,7 @@ class TaskManager:
         self.add(self.__doLaterProcessor, "doLaterProcessor", -10)
         self.add(self.__doLaterProcessor, "doLaterProcessor", -10)
 
 
 
 
-    def stepping(self, value):
+    def setStepping(self, value):
         self.stepping = value
         self.stepping = value
 
 
     def setVerbose(self, value):
     def setVerbose(self, value):
@@ -1111,16 +1111,18 @@ class TaskManager:
         tasks = []
         tasks = []
         for taskPriList in self.taskList:
         for taskPriList in self.taskList:
             for task in taskPriList:
             for task in taskPriList:
-                if task is not None:
+                if task is not None and not task._removed:
                     tasks.append(task)
                     tasks.append(task)
         for pri, taskList in self.pendingTaskDict.iteritems():
         for pri, taskList in self.pendingTaskDict.iteritems():
             for task in taskList:
             for task in taskList:
-                tasks.append(task)
+                if not task._removed:
+                    tasks.append(task)
         return tasks
         return tasks
 
 
     def getDoLaters(self):
     def getDoLaters(self):
         # returns list of all doLaters in arbitrary order
         # returns list of all doLaters in arbitrary order
-        return self.__doLaterList[:]
+        return [doLater for doLater in self.__doLaterList
+                if not doLater._removed]
 
 
     def resetStats(self):
     def resetStats(self):
         # WARNING: this screws up your do-later timings
         # WARNING: this screws up your do-later timings