Author: dmeyer
Date: Mon Jan 21 07:35:19 2008
New Revision: 3001
Log:
Adjust to new InProgress exception style
Modified:
trunk/base/src/notifier/sockets.py
trunk/base/src/notifier/yieldfunc.py
trunk/popcorn/src/backends/mplayer/player.py
Modified: trunk/base/src/notifier/sockets.py
==============================================================================
--- trunk/base/src/notifier/sockets.py (original)
+++ trunk/base/src/notifier/sockets.py Mon Jan 21 07:35:19 2008
@@ -181,6 +181,12 @@
cb = Callback(lambda res, x: x.append(res), result_holder)
else:
cb = self.signals["connected"].emit
+
+
+ # XXX FIXME: exception handling is wrong
+ # XXX At will call self.signals["connected"] with three arguments
+ # XXX or crash with result_holder
+
in_progress.connect_both(cb, cb)
if async != None:
Modified: trunk/base/src/notifier/yieldfunc.py
==============================================================================
--- trunk/base/src/notifier/yieldfunc.py (original)
+++ trunk/base/src/notifier/yieldfunc.py Mon Jan 21 07:35:19 2008
@@ -343,7 +343,7 @@
self._func._lock.connect_both(self._try_again, self._try_again)
- def _try_again(self, result):
+ def _try_again(self, *args, **kwargs):
"""
Try to start now.
"""
Modified: trunk/popcorn/src/backends/mplayer/player.py
==============================================================================
--- trunk/popcorn/src/backends/mplayer/player.py (original)
+++ trunk/popcorn/src/backends/mplayer/player.py Mon Jan 21 07:35:19 2008
@@ -180,8 +180,8 @@
self._osd_shmem.detach()
- def _handle_mp_info(self, info):
- if isinstance(info, Exception):
+ def _handle_mp_info(self, info, exception=None, traceback=None):
+ if exception is not None:
self._state = STATE_NOT_RUNNING
# TODO: handle me
raise info
-------------------------------------------------------------------------
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
