Changeset 105

Timestamp:

08/16/06 09:36:51

Author:

dowski

Message:

A couple changes to make Workers and Schedulers more robust.

1. Worker.advance() now correctly handles self.recurrence == None.
2. Scheduler.stop() now correctly handles self.curthread == None

Files:

• recur.py (modified) (2 diffs)
• test_recur.py (modified) (3 diffs)

recur.py

@@ -792 +792 @@
-        If the recurrence series is exhausted, self.nextrun will be None.
-        """
+        if not self.recurrence:
+            self.nextrun = None
+            return
+        
-        try:
-            next = self.recurrence.next()
@@ -896 +900 @@
-    def stop(self):
-        self.terminated = True
-
+
+
-        for w in self.workers.values():
-            w.stop()

test_recur.py

@@ -446 +446 @@
-                recur.Worker.__init__(self, *args, **params)
-                self.active = False
-
+
-            def work(self):
-                # This worker starts paused (inactive) and shouldn't do
-                # any work
-                paused[0] += 1
+        
+        # the aptly named...
+        class WorkerNotAppearingInThisFilm(recur.Worker):
+            def work(self):
+                pass
-        
-        s = recur.Scheduler({'mycounter': Counter("1 second")})
@@ -461 +466 @@
-        s = recur.Scheduler({'c1': Counter("1 second"),
-                             'c2': AnotherCounter("2 seconds"),
-
+
+
+
+
+
+
-        s.start()
-        try:
@@ -503 +513 @@
-        finally:
-            s.stop()
-
+
+
+
+
+
+
-
-if __name__ == "__main__":