[SCM] morituri/master: * morituri/common/task.py: Document and change name of a method.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 114fb827cc1a452a66529da1bee5037277508315
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue May 24 10:39:02 2011 +0000

    	* morituri/common/task.py:
    	  Document and change name of a method.

diff --git a/ChangeLog b/ChangeLog
index 1b55d53..29ff88d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/task.py:
+	  Document and change name of a method.
+
+2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/common/gstreamer.py:
 	  Add a cvar to stop going to playing.
 	* morituri/image/image.py:
diff --git a/morituri/common/task.py b/morituri/common/task.py
index 609c839..006b977 100644
--- a/morituri/common/task.py
+++ b/morituri/common/task.py
@@ -117,8 +117,7 @@ class Task(object, log.Loggable):
             self._notifyListeners('described', description)
             self.description = description
 
-    # FIXME: does not actually raise
-    def setAndRaiseException(self, exception):
+    def setExceptionAndTraceback(self, exception):
         """
         Call this to set a synthetically created exception (and not one
         that was actually raised and caught)
@@ -140,8 +139,13 @@ class Task(object, log.Loggable):
         self.exceptionMessage = line
         self.exceptionTraceback = traceback.format_exc()
         self.debug('set exception, %r' % self.exceptionMessage)
+    # FIXME: remove
+    setAndRaiseException = setExceptionAndTraceback
 
     def setException(self, exception):
+        """
+        Call this to set a caught exception on the task.
+        """
         import traceback
 
         self.exception = exception

-- 
morituri packaging