Changeset f70792f for server/lib/gutenbach/server/job.py

Timestamp:

Jan 21, 2012, 5:11:09 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

279640c

Parents:

4914b47 (diff), 374c558 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Daniel Cooper <danny@…> (01/21/12 17:11:09)

git-committer:

Daniel Cooper <danny@…> (01/21/12 17:11:09)

Message:

Merge branch 'no-cups' of github.com:jhamrick/gutenbach into no-cups

File:

• server/lib/gutenbach/server/job.py (modified) (1 diff)

server/lib/gutenbach/server/job.py

@@ -322 +322 @@
         self.player.mplayer_pause()
 
+    def resume(self):
+        """Non-blocking resume.  Job must be paused (see
+        'GutenbachJob.is_paused').
+
+        Raises
+        ------
+        InvalidJobStateException
+            If the job is not paused.
+
+        """
+        if not self.is_paused:
+            raise errors.InvalidJobStateException(self.state)
+        self.player.mplayer_pause()
+
     def cancel(self):
         """Blocking cancel. The job must not have been previously