Changeset 97f20dd for server/lib/gutenbach/server/job.py

Timestamp:

Jan 22, 2012, 1:05:21 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

2834b9a

Parents:

b3a56af

git-author:

Jessica B. Hamrick <jhamrick@…> (01/22/12 01:05:21)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/22/12 01:05:21)

Message:

Add documentation for printer and job attributes

File:

• server/lib/gutenbach/server/job.py (modified) (8 diffs)

server/lib/gutenbach/server/job.py

@@ -168 +168 @@
                self.player is not None and \
                not self.player.is_playing and \
-               not self._why_done == "cancelled" and \
+               not self._why_done == "canceled" and \
                not self._why_done == "aborted"
 
@@ -202 +202 @@
                 self.player is not None and \
                 self.player.is_done) or \
-                (self._why_done == "cancelled" or \
+                (self._why_done == "canceled" or \
                  self._why_done == "aborted")
 
@@ -214 +214 @@
 
     @property
-    def is_cancelled(self):
-        """Whether the job was cancelled.
-
-        """
-
-        return self.is_done and self._why_done == "cancelled"
+    def is_canceled(self):
+        """Whether the job was canceled.
+
+        """
+
+        return self.is_done and self._why_done == "canceled"
 
     @property
@@ -235 +235 @@
         
             HELD ---> PENDING ---> PROCESSING <--> STOPPED (aka paused)
-                         ^              |---> CANCELLED
+                         ^              |---> CANCELED
                          |              |---> ABORTED
                          |              |---> COMPLETE ---|
@@ -247 +247 @@
             state = States.PROCESSING
         elif self.is_playing and self.is_paused:
-            state = States.STOPPED
+            state = States.PROCESSING_STOPPED
         elif self.is_completed:
-            state = States.COMPLETE
-        elif self.is_cancelled:
-            state = States.CANCELLED
+            state = States.COMPLETED
+        elif self.is_canceled:
+            state = States.CANCELED
         elif self.is_aborted:
             state = States.ABORTED
         else:
-            state = States.HELD
+            state = States.PENDING_HELD
         return state
 
@@ -293 +293 @@
         """
 
-        if not self.is_valid or self.state != States.HELD:
+        if not self.is_valid or self.state != States.PENDING_HELD:
             raise errors.InvalidJobStateException(self.state)
         self.verify_document(document)
@@ -357 +357 @@
         """Blocking cancel. The job must not have been previously
         aborted or completed (though this method will succeed if it
-        was previously cancelled).  This should be used to stop the
+        was previously canceled).  This should be used to stop the
         job following an external request.
 
@@ -371 +371 @@
             self.player.mplayer_stop()
 
-        elif self.is_done and not self._why_done == "cancelled":
-            raise errors.InvalidJobStateException(self.state)
-
-        logger.info("cancelled job %s" % str(self))
-        self._why_done = "cancelled"
+        elif self.is_done and not self._why_done == "canceled":
+            raise errors.InvalidJobStateException(self.state)
+
+        logger.info("canceled job %s" % str(self))
+        self._why_done = "canceled"
 
     def abort(self):
         """Blocking abort. The job must not have been previously
-        cancelled or completed (though this method will succeed if it
+        canceled or completed (though this method will succeed if it
         was previously aborted).  This should be used to stop the job
         following internal errors.