[Pydispatcher-cvs] pydispatch __init__.py, 1.2, 1.3 dispatcher.py, 1.1.1.1, 1.2 robustapply.py, 1.1.1.1, 1.2 saferef.py, 1.2, 1.3 setup.py, 1.2, 1.3

[Mike C. F. <mcf...@us...>]

Update of /cvsroot/pydispatcher/pydispatch
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26717

Modified Files:
	__init__.py dispatcher.py robustapply.py saferef.py setup.py 
Log Message:
Eliminate -3 warnings (i.e. prepare for Python 3.x)
Bump version.
Remove SF download link that's currently broken.


Index: setup.py
===================================================================
RCS file: /cvsroot/pydispatcher/pydispatch/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.py	14 Nov 2008 18:09:51 -0000	1.2
--- setup.py	30 Mar 2010 15:32:09 -0000	1.3
***************
*** 17,21 ****
  			"""Intended Audience :: Developers""",
  		],
! 		'download_url': "https://sourceforge.net/project/showfiles.php?group_id=79755",
  		'keywords': 'dispatcher,dispatch,pydispatch,event,signal,sender,receiver,propagate,multi-consumer,multi-producer,saferef,robustapply,apply',
  		'long_description' : """Dispatcher mechanism for creating event models
--- 17,21 ----
  			"""Intended Audience :: Developers""",
  		],
! 		#'download_url': "http://sourceforge.net/projects/pydispatcher/files/pydispatcher/",
  		'keywords': 'dispatcher,dispatch,pydispatch,event,signal,sender,receiver,propagate,multi-consumer,multi-producer,saferef,robustapply,apply',
  		'long_description' : """Dispatcher mechanism for creating event models

Index: dispatcher.py
===================================================================
RCS file: /cvsroot/pydispatcher/pydispatch/dispatcher.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dispatcher.py	7 Jul 2006 15:59:38 -0000	1.1.1.1
--- dispatcher.py	30 Mar 2010 15:32:09 -0000	1.2
***************
*** 34,43 ****
  __version__ = "$Revision$"[11:-2]
  
- try:
- 	True
- except NameError:
- 	True = 1==1
- 	False = 1==0
- 
  class _Parameter:
  	"""Used to represent default parameter values."""
--- 34,37 ----
***************
*** 141,145 ****
  		receiver = saferef.safeRef(receiver, onDelete=_removeReceiver)
  	senderkey = id(sender)
! 	if connections.has_key(senderkey):
  		signals = connections[senderkey]
  	else:
--- 135,139 ----
  		receiver = saferef.safeRef(receiver, onDelete=_removeReceiver)
  	senderkey = id(sender)
! 	if senderkey in connections:
  		signals = connections[senderkey]
  	else:
***************
*** 161,165 ****
  	# get current set, remove any current references to
  	# this receiver in the set, including back-references
! 	if signals.has_key(signal):
  		receivers = signals[signal]
  		_removeOldBackRefs(senderkey, signal, receiver, receivers)
--- 155,159 ----
  	# get current set, remove any current references to
  	# this receiver in the set, including back-references
! 	if signal in signals:
  		receivers = signals[signal]
  		_removeOldBackRefs(senderkey, signal, receiver, receivers)
***************
*** 297,301 ****
  			if receiver: # filter out dead instance-method weakrefs
  				try:
! 					if not receivers.has_key( receiver ):
  						receivers[receiver] = 1
  						yield receiver
--- 291,295 ----
  			if receiver: # filter out dead instance-method weakrefs
  				try:
! 					if receiver not in receivers:
  						receivers[receiver] = 1
  						yield receiver
***************
*** 378,403 ****
  		return False
  	backKey = id(receiver)
! 	for senderkey in sendersBack.get(backKey,()):
! 		try:
! 			signals = connections[senderkey].keys()
! 		except KeyError,err:
! 			pass
! 		else:
! 			for signal in signals:
! 				try:
! 					receivers = connections[senderkey][signal]
! 				except KeyError:
! 					pass
! 				else:
  					try:
! 						receivers.remove( receiver )
! 					except Exception, err:
  						pass
! 				_cleanupConnections(senderkey, signal)
! 	try:
! 		del sendersBack[ backKey ]
! 	except KeyError:
! 		pass
! 			
  def _cleanupConnections(senderkey, signal):
  	"""Delete any empty signals for senderkey. Delete senderkey if empty."""
--- 372,398 ----
  		return False
  	backKey = id(receiver)
! 	try:
! 		backSet = sendersBack.pop(backKey)
! 	except KeyError, err:
! 		return False 
! 	else:
! 		for senderkey in backSet:
! 			try:
! 				signals = connections[senderkey].keys()
! 			except KeyError,err:
! 				pass
! 			else:
! 				for signal in signals:
  					try:
! 						receivers = connections[senderkey][signal]
! 					except KeyError:
  						pass
! 					else:
! 						try:
! 							receivers.remove( receiver )
! 						except Exception, err:
! 							pass
! 					_cleanupConnections(senderkey, signal)
! 
  def _cleanupConnections(senderkey, signal):
  	"""Delete any empty signals for senderkey. Delete senderkey if empty."""

Index: robustapply.py
===================================================================
RCS file: /cvsroot/pydispatcher/pydispatch/robustapply.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** robustapply.py	7 Jul 2006 15:59:38 -0000	1.1.1.1
--- robustapply.py	30 Mar 2010 15:32:09 -0000	1.2
***************
*** 33,37 ****
  	acceptable = codeObject.co_varnames[startIndex+len(arguments):codeObject.co_argcount]
  	for name in codeObject.co_varnames[startIndex:startIndex+len(arguments)]:
! 		if named.has_key( name ):
  			raise TypeError(
  				"""Argument %r specified both positionally and as a keyword for calling %r"""% (
--- 33,37 ----
  	acceptable = codeObject.co_varnames[startIndex+len(arguments):codeObject.co_argcount]
  	for name in codeObject.co_varnames[startIndex:startIndex+len(arguments)]:
! 		if name in named:
  			raise TypeError(
  				"""Argument %r specified both positionally and as a keyword for calling %r"""% (
***************
*** 47,49 ****
  	return receiver(*arguments, **named)
  
! 			
\ No newline at end of file
--- 47,49 ----
  	return receiver(*arguments, **named)
  
! 			

Index: __init__.py
===================================================================
RCS file: /cvsroot/pydispatcher/pydispatch/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py	7 Jul 2006 16:03:59 -0000	1.2
--- __init__.py	30 Mar 2010 15:32:09 -0000	1.3
***************
*** 1,5 ****
  """Multi-consumer multi-producer dispatching mechanism
  """
! __version__ = "2.0.0"
  __author__ = "Patrick K. O'Brien"
  __license__ = "BSD-style, see license.txt for details"
--- 1,5 ----
  """Multi-consumer multi-producer dispatching mechanism
  """
! __version__ = "2.0.1"
  __author__ = "Patrick K. O'Brien"
  __license__ = "BSD-style, see license.txt for details"

Index: saferef.py
===================================================================
RCS file: /cvsroot/pydispatcher/pydispatch/saferef.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** saferef.py	14 Nov 2008 18:08:50 -0000	1.2
--- saferef.py	30 Mar 2010 15:32:09 -0000	1.3
***************
*** 23,27 ****
  			)
  			return reference
! 	if callable(onDelete):
  		return weakref.ref(target, onDelete)
  	else:
--- 23,27 ----
  			)
  			return reference
! 	if onDelete is not None:
  		return weakref.ref(target, onDelete)
  	else:
***************
*** 108,112 ****
  			for function in methods:
  				try:
! 					if callable( function ):
  						function( self )
  				except Exception, e:
--- 108,112 ----
  			for function in methods:
  				try:
! 					if hasattr(function, '__call__' ):
  						function( self )
  				except Exception, e: