Author: tack
Date: Fri Jan 4 13:09:37 2008
New Revision: 2936
Log:
Bring most of notifier directly into kaa namespace.
Modified:
trunk/base/src/__init__.py
trunk/base/src/notifier/__init__.py
Modified: trunk/base/src/__init__.py
==============================================================================
--- trunk/base/src/__init__.py (original)
+++ trunk/base/src/__init__.py Fri Jan 4 13:09:37 2008
@@ -29,7 +29,8 @@
import logger
# import some basic notifier functions
-from kaa.notifier import signals, loop as main, shutdown
+from kaa.notifier import *
+from kaa.notifier import loop as main
# strutils
import strutils
Modified: trunk/base/src/notifier/__init__.py
==============================================================================
--- trunk/base/src/notifier/__init__.py (original)
+++ trunk/base/src/notifier/__init__.py Fri Jan 4 13:09:37 2008
@@ -44,18 +44,35 @@
from popen import Process
from popen import proclist as _proclist
-from callback import *
-from thread import *
-from timer import *
-from sockets import *
-from event import *
-from yieldfunc import *
+from callback import Callback, WeakCallback, Signal, Signals
+from thread import MainThreadCallback, Thread, is_mainthread, wakeup,
set_current_as_mainthread
+from timer import Timer, WeakTimer, OneShotTimer, WeakOneShotTimer, AtTimer,
OneShotAtTimer
+from sockets import SocketDispatcher, WeakSocketDispatcher, Socket, IO_READ,
IO_WRITE
+from event import Event, EventHandler, WeakEventHandler
+from yieldfunc import YieldContinue, YieldCallback, YieldFunction,
yield_execution
from jobserver import ThreadCallback, execute_in_thread
from jobserver import killall as kill_jobserver
from async import Progress, InProgress
from decorators import execute_in_timer, execute_in_mainloop
+# Here's what will be imported into the kaa namespace.
+__all__ = [
+ # From sub modules
+ 'Process',
+ 'Callback', 'WeakCallback', 'Signal', 'Signals',
+ 'MainThreadCallback', 'Thread', 'is_mainthread', 'wakeup',
'set_current_as_mainthread',
+ 'Timer', 'WeakTimer', 'OneShotTimer', 'WeakOneShotTimer', 'AtTimer',
'OneShotAtTimer',
+ 'SocketDispatcher', 'WeakSocketDispatcher', 'Socket', 'IO_READ',
'IO_WRITE',
+ 'Event', 'EventHandler', 'WeakEventHandler',
+ 'YieldContinue', 'YieldCallback', 'yield_execution', 'YieldFunction',
+ 'ThreadCallback', 'execute_in_thread',
+
+ # From this module
+ 'init', 'shutdown', 'step', 'running', 'signals'
+ # 'loop' gets imported as 'main'
+]
+
# get logging object
log = logging.getLogger('notifier')
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
