[SCM] morituri/master: * morituri/common/task.py: * morituri/image/image.py: Remove prints. Describe tasks.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e5ad3bde58d1eb286bce00cb1005d0af141dc1d7
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Thu May 7 11:11:22 2009 +0000

    	* morituri/common/task.py:
    	* morituri/image/image.py:
    	  Remove prints.  Describe tasks.

diff --git a/ChangeLog b/ChangeLog
index 3fd9804..578a916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2009-05-07  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/task.py:
+	* morituri/image/image.py:
+	  Remove prints.  Describe tasks.
+
+2009-05-07  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/task.py:
 	  Add an exception ivar for tasks to set an exception on while
 	  running.  Make SyncRunner raise it during done()
 	* morituri/program/cdparanoia.py:
diff --git a/morituri/common/task.py b/morituri/common/task.py
index 385eac5..f85eca6 100644
--- a/morituri/common/task.py
+++ b/morituri/common/task.py
@@ -178,6 +178,7 @@ class MultiSeparateTask(BaseMultiTask):
     I perform multiple tasks.
     I track progress of each individual task, going back to 0 for each task.
     """
+    description = 'Doing various tasks separately'
 
     def start(self, runner):
         self.debug('MultiSeparateTask.start()')
@@ -194,7 +195,6 @@ class MultiSeparateTask(BaseMultiTask):
         self.setProgress(value)
 
     def described(self, description):
-        print 'description'
         self.setDescription("%s (%d of %d) ..." % (
             description, self._task, len(self.tasks)))
 
@@ -204,6 +204,7 @@ class MultiCombinedTask(BaseMultiTask):
     I track progress as a combined progress on all tasks on task granularity.
     """
 
+    description = 'Doing various tasks combined'
     _stopped = 0
        
     ### listener methods
@@ -330,7 +331,6 @@ class SyncRunner(TaskRunner):
             self._report()
 
     def stopped(self, task):
-        print 'stopped'
         self.progressed(task, 1.0)
         self._loop.quit()
 
diff --git a/morituri/image/image.py b/morituri/image/image.py
index 34afc0a..efb31c5 100644
--- a/morituri/image/image.py
+++ b/morituri/image/image.py
@@ -131,6 +131,7 @@ class AudioLengthTask(task.Task):
     @ivar  length: length of the decoded audio file, in audio frames.
     """
 
+    description = 'Getting length of audio track'
     length = None
 
     def __init__(self, path):

-- 
morituri packaging