Author: dmeyer
Date: Wed Feb 13 15:24:44 2008
New Revision: 3082
Log:
fix imports, jobserver.py and decorators.py is gone now
Modified:
trunk/base/src/notifier/__init__.py
trunk/base/src/notifier/main.py
trunk/base/src/notifier/sockets.py
Modified: trunk/base/src/notifier/__init__.py
==============================================================================
--- trunk/base/src/notifier/__init__.py (original)
+++ trunk/base/src/notifier/__init__.py Wed Feb 13 15:24:44 2008
@@ -33,15 +33,12 @@
from popen import Process
from callback import Callback, WeakCallback
from signals import Signal, Signals
-from thread import MainThreadCallback, ThreadCallback, is_mainthread
-from timer import Timer, WeakTimer, OneShotTimer, WeakOneShotTimer, AtTimer,
OneShotAtTimer
+from thread import MainThreadCallback, NamedThreadCallback, ThreadCallback,
is_mainthread, threaded, MAINTHREAD
+from timer import Timer, WeakTimer, OneShotTimer, WeakOneShotTimer, AtTimer,
OneShotAtTimer, timed, POLICY_ONCE, POLICY_MANY, POLICY_RESTART
from sockets import IOMonitor, WeakIOMonitor, Socket, IO_READ, IO_WRITE
from event import Event, EventHandler, WeakEventHandler
from coroutine import YieldContinue, YieldCallback, YieldFunction, coroutine
-from jobserver import NamedThreadCallback
from async import InProgress
-from decorators import timed, threaded, MAINTHREAD, POLICY_ONCE, POLICY_MANY,
POLICY_RESTART
-
# XXX: wrappers for deprecated (renamed) decorators. Everything below
Modified: trunk/base/src/notifier/main.py
==============================================================================
--- trunk/base/src/notifier/main.py (original)
+++ trunk/base/src/notifier/main.py Wed Feb 13 15:24:44 2008
@@ -42,9 +42,8 @@
import nf_wrapper as notifier
from signals import Signal
from popen import proclist as _proclist
-from thread import is_mainthread, wakeup, set_as_mainthread
+from thread import is_mainthread, wakeup, set_as_mainthread, threaded,
MAINTHREAD
from thread import killall as kill_jobserver
-from decorators import threaded, MAINTHREAD
__all__ = [ 'run', 'stop', 'step', 'select_notifier', 'is_running', 'wakeup',
'set_as_mainthread', 'is_shutting_down' ]
Modified: trunk/base/src/notifier/sockets.py
==============================================================================
--- trunk/base/src/notifier/sockets.py (original)
+++ trunk/base/src/notifier/sockets.py Wed Feb 13 15:24:44 2008
@@ -37,10 +37,9 @@
import logging
import nf_wrapper as notifier
-from decorators import threaded
from callback import Callback
from signals import Signal
-from thread import MainThreadCallback, ThreadCallback, is_mainthread
+from thread import MainThreadCallback, ThreadCallback, is_mainthread, threaded
# get logging object
log = logging.getLogger('notifier')
-------------------------------------------------------------------------
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
