[Checkins] SVN: lovely.remotetask/branches/adamg-startlater/ removed jobClass

[Adam Groszer]

Log message for revision 83284:
  removed jobClass

Changed:
  U   lovely.remotetask/branches/adamg-startlater/CHANGES.txt
  U   lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/README.txt
  U   lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/interfaces.py
  U   lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/service.py

-=-
Modified: lovely.remotetask/branches/adamg-startlater/CHANGES.txt
===================================================================
--- lovely.remotetask/branches/adamg-startlater/CHANGES.txt	2008-01-28 14:44:19 UTC (rev 83283)
+++ lovely.remotetask/branches/adamg-startlater/CHANGES.txt	2008-01-28 15:53:22 UTC (rev 83284)
@@ -9,9 +9,6 @@
 
 - Added ``startLater`` to ``TaskService.add``. See startlater.txt for more info.
   This facilitates to separate jobb add and start timepoints. (Not cron-like)
-  
-- Added ``jobClass`` to ``TaskService.add``.
-  This facilitates to add our own job class.
 
 2007/12/?? (new):
 =================
@@ -125,4 +122,3 @@
 
  - added namespace declaration in lovely/__init__.py
  - allow to delay a job
-

Modified: lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/README.txt
===================================================================
--- lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/README.txt	2008-01-28 14:44:19 UTC (rev 83283)
+++ lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/README.txt	2008-01-28 15:53:22 UTC (rev 83284)
@@ -724,40 +724,6 @@
      >>> root_service.clean()
 
 
-Adding our own job class
-------------------------
-
-For the sake of simplicity we just change the name of the class:
-
-  >>> from lovely.remotetask.job import Job
-  >>> class OurJob(Job):
-  ...     pass
-
-Let's reuse the service:
-
-  >>> service.clean()
-
-Add our ``OurJob``:  
-
-  >>> jobid = service.add(u'echo', {'foo': 'bar'}, jobClass = OurJob)
-  >>> jobid
-  7
-
-It got added:
-
-  >>> dict(service.jobs)
-  {6: <CronJob 6>, 7: <OurJob 7>}
-
-It's queued as usual:
-
-  >>> service.getStatus(jobid)
-  'queued'
-
-Remove our traces, because OurJob cannot be pickled:
-
-  >>> service.cancel(jobid)
-  >>> service.clean()
-
 Check Interfaces and stuff
 --------------------------
 
@@ -768,7 +734,8 @@
   True
   >>> interfaces.ITaskService.providedBy(service)
   True
-  
+
+  >>> from lovely.remotetask.job import Job
   >>> fakejob = Job(1, u'echo', {})
   >>> verifyClass(interfaces.IJob, Job)
   True
@@ -776,7 +743,7 @@
   True
   >>> interfaces.IJob.providedBy(fakejob)
   True
-  
+
   >>> fakecronjob = CronJob(1, u'echo', {})
   >>> verifyClass(interfaces.ICronJob, CronJob)
   True

Modified: lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/interfaces.py
===================================================================
--- lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/interfaces.py	2008-01-28 14:44:19 UTC (rev 83283)
+++ lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/interfaces.py	2008-01-28 15:53:22 UTC (rev 83284)
@@ -85,14 +85,12 @@
     def getAvailableTasks():
         """Return a mapping of task name to the task."""
 
-    def add(task, input=None, startLater=False, jobClass=None):
+    def add(task, input=None, startLater=False):
         """Add a new job for the specified task.
 
         * task argument is a string specifying the task.
         * input are arguments for the task.
-        * jobClass is a class which will instantiated for the queue
-          by default it's a job.Job
-        * startLater, if True job will be added (gets a jobid) but needs 
+        * startLater, if True job will be added (gets a jobid) but needs
           to be started with startJob later
         """
 
@@ -108,7 +106,7 @@
     def startJob(jobid):
         """Start a job previously added job with add(..., startLater=True)
         """
-    
+
     def reschedule(jobid):
         """Rescheudle a cron job.
 

Modified: lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/service.py
===================================================================
--- lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/service.py	2008-01-28 14:44:19 UTC (rev 83283)
+++ lovely.remotetask/branches/adamg-startlater/src/lovely/remotetask/service.py	2008-01-28 15:53:22 UTC (rev 83284)
@@ -64,15 +64,13 @@
         """See interfaces.ITaskService"""
         return dict(component.getUtilitiesFor(self.taskInterface))
 
-    def add(self, task, input=None, startLater=False, jobClass=None):
+    def add(self, task, input=None, startLater=False):
         """See interfaces.ITaskService"""
         if task not in self.getAvailableTasks():
             raise ValueError('Task does not exist')
-        if jobClass == None:
-            jobClass = job.Job
         jobid = self._counter
         self._counter += 1
-        newjob = jobClass(jobid, task, input)
+        newjob = job.Job(jobid, task, input)
         self.jobs[jobid] = newjob
         if startLater:
             newjob.status = interfaces.STARTLATER
@@ -100,7 +98,7 @@
             newjob.status = interfaces.DELAYED
         self._scheduledQueue.put(newjob)
         return jobid
-    
+
     def startJob(self, jobid):
         job = self.jobs[jobid]
         if job.status == interfaces.STARTLATER: