Author: tack
Date: Tue Feb 12 20:35:41 2008
New Revision: 3054
Log:
Forgot to commit this. Last log entry applies to this file too.
Modified:
trunk/base/src/notifier/yieldfunc.py
Modified: trunk/base/src/notifier/yieldfunc.py
==============================================================================
--- trunk/base/src/notifier/yieldfunc.py (original)
+++ trunk/base/src/notifier/yieldfunc.py Tue Feb 12 20:35:41 2008
@@ -267,13 +267,11 @@
# An InProgress we were waiting on raised an exception. We are
# "inheriting" this exception, so return False to prevent it
# from being logged as unhandled in the other InProgress.
- # Remove the internal timer and the async result to remove bad
- # circular references.
- self._timer = None
- self._async = None
- self._yield__function = None
- self.throw(*args)
+ # Call _step() so that we throw the exception and clear
+ # any state.
+ self._step()
return False
+
if self._timer:
# continue calling _step
self._timer.start(self._interval)
@@ -314,6 +312,7 @@
self._yield__function = None
self.throw(*sys.exc_info())
return False
+
# We have to stop the timer because we either have a result
# or have to wait for an InProgress
self._timer.stop()
@@ -322,6 +321,7 @@
self._async = result
result.connect_both(self._continue, self._continue)
return False
+
# YieldFunction is done
# Remove the internal timer and the async result to remove bad
# circular references.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
