* notifier/threads.py (Enhanced): new thread cass supporting thread-safe signals

	(threaded): a decorator that simplifies running a function as a thread

	* notifier/nf_generic.py (step): if there are no timers and socket
	events the loop sleeps for dispatch.MIN_TIMER that was passed to
	time.sleep without dividing by 1000. That caused a sleep for 1
	minute and 40 seconds instead of 100 milliseconds.

Author: Andreas Büsching

ChangeLog

@@ -1,3 +1,13 @@
+2012-03-23  Andreas B�sching  <crunchy@bitkipper.net>
+
+	* notifier/threads.py (Enhanced): new thread cass supporting thread-safe signals
+	(threaded): a decorator that simplifies running a function as a thread
+
+	* notifier/nf_generic.py (step): if there are no timers and socket
+	events the loop sleeps for dispatch.MIN_TIMER that was passed to
+	time.sleep without dividing by 1000. That caused a sleep for 1
+	minute and 40 seconds instead of 100 milliseconds.
+
 2011-10-23  Andreas B�sching  <crunchy@bitkipper.net>
 
 	* notifier/version.py: set version to 0.9.3

notifier/nf_generic.py

@@ -5,7 +5,7 @@
 #
 # generic notifier implementation
 #
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #	Andreas Büsching <crunchy@bitkipper.net>
 #
 # This library is free software; you can redistribute it and/or modify
@@ -225,7 +225,7 @@ def step( sleep = True, external = True ):
 		elif timeout:
 			time_sleep( timeout / 1000.0 )
 		elif timeout == None: # if there are no timers and no sockets, do not burn the CPU
-			time_sleep( dispatch.MIN_TIMER )
+			time_sleep( dispatch.MIN_TIMER / 1000.0 )
 
 		# handle timers
 		for i, timer in __timers.items():

notifier/signals.py

@@ -5,7 +5,7 @@
 #
 # a generic signal implementation for propagating asynchron events
 #
-# Copyright (C) 2005, 2006, 2010
+# Copyright (C) 2005, 2006, 2010, 2011
 #	Andreas Büsching <crunchy@bitkipper.net>
 #
 # This library is free software; you can redistribute it and/or modify
@@ -24,22 +24,30 @@
 
 __signals = {}
 
+# exception classes
+class UnknownSignalError( Exception ):
+	pass
+
+class SignalExistsError( Exception ):
+	pass
+
 class Signal( object ):
 	def __init__( self, name ):
 		self.name = name
 		self.__callbacks = []
 
 	def emit( self, *args ):
 		for cb in self.__callbacks:
-			if args: cb( *args )
-			else: cb()
+			cb( *args )
 
 	def connect( self, callback ):
 		self.__callbacks.append( callback )
 
 	def disconnect( self, callback ):
-		try: self.__callbacks.remove( callback )
-		except: pass
+		try:
+			self.__callbacks.remove( callback )
+		except:
+			pass
 
 	def __str__( self ):
 		return self.name
@@ -61,63 +69,55 @@ def signal_disconnect( self, signal, callback ):
 		disconnect( signal, callback, self.__signals )
 
 	def signal_emit( self, signal, *args ):
-		if isinstance( signal, Signal ) and \
-			   self.__signals.has_key( signal.name ):
+		if isinstance( signal, Signal ) and signal.name in self.__signals:
 			self.__signals[ signal.name ].emit( *args )
-		elif isinstance( signal, str ) and self.__signals.has_key( signal ):
+		elif isinstance( signal, basestring ) and signal in self.__signals:
 			self.__signals[ signal ].emit( *args )
 
 def _select_signals( signals ):
 	global __signals
-	if signals == None: return __signals
-	else: return signals
+	return signals is None and __signals or signals
 
 def new( signal, signals = None ):
 	_signals = _select_signals( signals )
-	if isinstance( signal, str ):
+	if isinstance( signal, basestring ):
 		signal = Signal( signal )
 
-	if _signals.has_key( signal.name ):
+	if signal.name in _signals:
 		raise SignalExistsError( "Signal '%s' already exists" % signal.name )
 	else:
 		_signals[ signal.name ] = signal
 
 def exists( signal, signals = None ):
 	_signals = _select_signals( signals )
-	if isinstance( signal, str ):
-		return _signals.has_key( signal )
+	if isinstance( signal, basestring ):
+		return signal in _signals
 	else:
-		return _signals.has_key( signal.name )
+		return signal.name in _signals
 
 def connect( signal, callback, signals = None ):
 	_signals = _select_signals( signals )
-	if isinstance( signal, Signal ) and _signals.has_key( signal.name ):
+	if isinstance( signal, Signal ) and signal.name in _signals:
 		_signals[ signal.name ].connect( callback )
-	elif isinstance( signal, str ):
-		if _signals.has_key( signal ):
+	elif isinstance( signal, basestring ):
+		if signal in _signals:
 			_signals[ signal ].connect( callback )
 		else:
 			raise UnknownSignalError( "unknown signal '%s'" % signal )
 
 
 def disconnect( signal, callback, signals = None ):
 	_signals = _select_signals( signals )
-	if isinstance( signal, Signal ) and _signals.has_key( signal.name ):
+	if isinstance( signal, Signal ) and signal.name in _signals:
 		_signals[ signal.name ].disconnect( callback )
-	elif isinstance( signal, str ) and _signals.has_key( signal ):
+	elif isinstance( signal, basestring ) and signal in _signals:
 		_signals[ signal ].disconnect( callback )
 
 def emit( signal, *args ):
-	if isinstance( signal, Signal ) and __signals.has_key( signal.name ):
+	if isinstance( signal, Signal ) and signal.name in __signals:
 		__signals[ signal.name ].emit( *args )
-	elif isinstance( signal, str ):
-		if __signals.has_key( signal ):
+	elif isinstance( signal, basestring ):
+		if signal in __signals:
 			__signals[ signal ].emit( *args )
 		else:
 			raise UnknownSignalError( "unknown signal '%s'" % signal )
-
-class UnknownSignalError( Exception ):
-	pass
-
-class SignalExistsError( Exception ):
-	pass

notifier/threads.py

@@ -5,7 +5,7 @@
 #
 # simple interface to handle threads synchron to the notifier loop
 #
-# Copyright (C) 2006, 2011
+# Copyright (C) 2006, 2011, 2012
 #	Andreas Büsching <crunchy@bitkipper.net>
 #
 # This library is free software; you can redistribute it and/or modify
@@ -24,10 +24,13 @@
 
 import notifier
 
+import functools
 import sys
 import thread
 import traceback
 
+import .signals
+
 __all__ = [ 'Simple' ]
 
 _threads = []
@@ -133,18 +136,43 @@ def unlock( self ):
 	def announce( self ):
 		self._callback( self, self._result )
 
+class Enhanced( Simple ):
+	def __init__( self, function, callback ):
+		Simple.__init__( self, '__enhanced__', function, callback )
+		self._signals = []
+
+	def signal_emit( self, signal, *args ):
+		self.lock()
+		self._signals.append( ( signal, args ) )
+		self.unlock()
+
 def _simple_threads_dispatcher():
 	"""Dispatcher function checking for finished threads"""
-	finished = []
 	global _threads
-	for task in _threads:
+
+	for task in _threads[ : ]:
 		task.lock()
 		if task.finished:
 			task.announce()
-			finished.append( task )
+			_threads.remove( task )
+		elif getattr( task, '_signals' ):
+			for signal, args in task._signals:
+				signals.emit( signal, *args )
+			task._signals = []
 		task.unlock()
 
-	for t in finished:
-		_threads.remove( t )
-
 	return ( len( _threads ) > 0 )
+
+def threaded( finished_func ):
+	"""A decorator function making it simple to start a thread. Just
+	add the decorator to the function that should be the main thread
+	function. The argument is the function that should be invoked when
+	the thread has finished"""
+
+	def inner_thread( func ):
+		def wrapped( *args, **kwargs ):
+			thread = Enhanced( notifier.Callback( func, *args, **kwargs ), finished_func )
+			thread.run()
+		return functools.wraps( func )( wrapped )
+	return inner_thread
+

notifier/version.py

@@ -5,7 +5,7 @@
 #
 # version information
 #
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #		Andreas Büsching <crunchy@bitkipper.net>
 #
 # This library is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@
 
 major_number    = 0
 minor_number    = 9
-revision_number = 3
+revision_number = 4
 extension       = ''
 
 VERSION = "%d.%d.%d%s" % ( major_number, minor_number,