Author: dmeyer
Date: Wed Feb 13 13:43:13 2008
New Revision: 3069
Log:
rename (Weak)SocketDispatcher to (Weak)IOMonitor
Modified:
trunk/base/API_CHANGES.txt
trunk/base/src/extensions/inotify/__init__.py
trunk/base/src/input/lirc.py
trunk/base/src/input/stdin.py
trunk/base/src/net/tls.py
trunk/base/src/notifier/__init__.py
trunk/base/src/notifier/popen.py
trunk/base/src/notifier/sockets.py
trunk/base/src/rpc.py
Modified: trunk/base/API_CHANGES.txt
==============================================================================
--- trunk/base/API_CHANGES.txt (original)
+++ trunk/base/API_CHANGES.txt Wed Feb 13 13:43:13 2008
@@ -66,3 +66,7 @@
logged if they are used. @kaa.timed also changed the parameter
order and name. It is now interval, timer (default Timer) and
policy (default POLICY_RESTART).
+
+3. SocketDispatcher and WeakSocketDispatcher are renamed to IOMonitor
+ and WeakIOMonitor. The old name is still functional with a
+ warning.
Modified: trunk/base/src/extensions/inotify/__init__.py
==============================================================================
--- trunk/base/src/extensions/inotify/__init__.py (original)
+++ trunk/base/src/extensions/inotify/__init__.py Wed Feb 13 13:43:13 2008
@@ -91,7 +91,7 @@
raise SystemError, "INotify support not detected on this system."
fcntl.fcntl(self._fd, fcntl.F_SETFL, os.O_NONBLOCK)
- self._mon = kaa.WeakSocketDispatcher(self._handle_data)
+ self._mon = kaa.WeakIOMonitor(self._handle_data)
self._mon.register(self._fd)
Modified: trunk/base/src/input/lirc.py
==============================================================================
--- trunk/base/src/input/lirc.py (original)
+++ trunk/base/src/input/lirc.py Wed Feb 13 13:43:13 2008
@@ -144,7 +144,7 @@
return False
pylirc.blocking(0)
- _dispatcher = kaa.SocketDispatcher(_handle_lirc_input)
+ _dispatcher = kaa.IOMonitor(_handle_lirc_input)
_dispatcher.register(fd)
kaa.main.signals["shutdown"].connect(stop)
Modified: trunk/base/src/input/stdin.py
==============================================================================
--- trunk/base/src/input/stdin.py (original)
+++ trunk/base/src/input/stdin.py Wed Feb 13 13:43:13 2008
@@ -125,7 +125,7 @@
return True
-_dispatcher = kaa.SocketDispatcher(_handle_stdin_keypress)
+_dispatcher = kaa.IOMonitor(_handle_stdin_keypress)
def _keypress_signal_changed(s, flag):
if flag == kaa.Signal.SIGNAL_CONNECTED and s.count() == 1:
Modified: trunk/base/src/net/tls.py
==============================================================================
--- trunk/base/src/net/tls.py (original)
+++ trunk/base/src/net/tls.py Wed Feb 13 13:43:13 2008
@@ -56,7 +56,7 @@
while True:
n = handshake.next()
cb = kaa.YieldCallback()
- disp = kaa.notifier.SocketDispatcher(cb)
+ disp = kaa.notifier.IOMonitor(cb)
if n == 0:
disp.register(self.sock.fileno(), kaa.notifier.IO_READ)
if n == 1:
@@ -71,7 +71,7 @@
def fileno(self):
"""
Return socket descriptor. This makes this class feel like a normal
- socket to the SocketDispatcher.
+ socket to the IOMonitor.
"""
return self.sock.fileno()
Modified: trunk/base/src/notifier/__init__.py
==============================================================================
--- trunk/base/src/notifier/__init__.py (original)
+++ trunk/base/src/notifier/__init__.py Wed Feb 13 13:43:13 2008
@@ -34,7 +34,7 @@
from callback import Callback, WeakCallback, Signal, Signals
from thread import MainThreadCallback, ThreadCallback, is_mainthread
from timer import Timer, WeakTimer, OneShotTimer, WeakOneShotTimer, AtTimer,
OneShotAtTimer
-from sockets import SocketDispatcher, WeakSocketDispatcher, Socket, IO_READ,
IO_WRITE
+from sockets import IOMonitor, WeakIOMonitor, Socket, IO_READ, IO_WRITE
from event import Event, EventHandler, WeakEventHandler
from yieldfunc import YieldContinue, YieldCallback, YieldFunction, coroutine
from jobserver import NamedThreadCallback
@@ -69,3 +69,5 @@
execute_in_thread=wrap(threaded, 'execute_in_thread', 'threaded')
yield_execution=wrap(coroutine, 'yield_execution', 'coroutine')
+SocketDispatcher=wrap(IOMonitor, 'SocketDispatcher', 'IOMonitor')
+WeakSocketDispatcher=wrap(IOMonitor, 'WeakSocketDispatcher', 'WeakIOMonitor')
Modified: trunk/base/src/notifier/popen.py
==============================================================================
--- trunk/base/src/notifier/popen.py (original)
+++ trunk/base/src/notifier/popen.py Wed Feb 13 13:43:13 2008
@@ -59,7 +59,7 @@
from callback import Signal, Callback
from thread import MainThreadCallback, is_mainthread
from async import InProgress
-from sockets import SocketDispatcher, IO_WRITE
+from sockets import IOMonitor, IO_WRITE
# get logging object
log = logging.getLogger('notifier')
@@ -160,7 +160,7 @@
flags = fcntl.fcntl(self.child.tochild.fileno(), fcntl.F_GETFL)
fcntl.fcntl( self.child.tochild.fileno(), fcntl.F_SETFL, flags |
os.O_NONBLOCK )
- self._wmon = SocketDispatcher(self._handle_write)
+ self._wmon = IOMonitor(self._handle_write)
if self._write_buffer:
self._wmon.register(self.child.tochild, IO_WRITE)
Modified: trunk/base/src/notifier/sockets.py
==============================================================================
--- trunk/base/src/notifier/sockets.py (original)
+++ trunk/base/src/notifier/sockets.py Wed Feb 13 13:43:13 2008
@@ -30,7 +30,7 @@
#
# -----------------------------------------------------------------------------
-__all__ = [ 'SocketDispatcher', 'WeakSocketDispatcher', 'Socket',
+__all__ = [ 'IOMonitor', 'WeakIOMonitor', 'Socket',
'IO_READ', 'IO_WRITE' ]
import socket
@@ -47,10 +47,10 @@
IO_READ = 0
IO_WRITE = 1
-class SocketDispatcher(notifier.NotifierCallback):
+class IOMonitor(notifier.NotifierCallback):
def __init__(self, callback, *args, **kwargs):
- super(SocketDispatcher, self).__init__(callback, *args, **kwargs)
+ super(IOMonitor, self).__init__(callback, *args, **kwargs)
self.set_ignore_caller_args()
@@ -70,11 +70,11 @@
if not is_mainthread():
return MainThreadCallback(self.unregister)()
notifier.socket_remove(self._id, self._condition)
- super(SocketDispatcher, self).unregister()
+ super(IOMonitor, self).unregister()
-class WeakSocketDispatcher(notifier.WeakNotifierCallback, SocketDispatcher):
+class WeakIOMonitor(notifier.WeakNotifierCallback, IOMonitor):
pass
@@ -216,8 +216,8 @@
self._rmon.unregister()
self._wmon.unregister()
- self._rmon = SocketDispatcher(self._handle_read)
- self._wmon = SocketDispatcher(self._handle_write)
+ self._rmon = IOMonitor(self._handle_read)
+ self._wmon = IOMonitor(self._handle_write)
self._rmon.register(self._socket, IO_READ)
if self._write_buffer:
Modified: trunk/base/src/rpc.py
==============================================================================
--- trunk/base/src/rpc.py (original)
+++ trunk/base/src/rpc.py Wed Feb 13 13:43:13 2008
@@ -187,7 +187,7 @@
self.socket.setblocking(False)
self.socket.bind(address)
self.socket.listen(5)
- self._mon = kaa.WeakSocketDispatcher(self._new_connection)
+ self._mon = kaa.WeakIOMonitor(self._new_connection)
self._mon.register(self.socket.fileno())
# Remove socket file and close clients on shutdown
kaa.main.signals["shutdown"].connect_weak(self.close)
@@ -247,9 +247,9 @@
def __init__(self, sock, auth_secret, bufsize = None):
self._socket = sock
- self._rmon = kaa.SocketDispatcher(self._handle_read)
+ self._rmon = kaa.IOMonitor(self._handle_read)
self._rmon.register(self._socket.fileno(), kaa.IO_READ)
- self._wmon = kaa.SocketDispatcher(self._handle_write)
+ self._wmon = kaa.IOMonitor(self._handle_write)
self._authenticated = False
self._write_buffer = ''
self._write_buffer_delayed = ''
-------------------------------------------------------------------------
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
