[Pybot-commits] CVS: pybot/pybot option.py,1.1.1.1,1.2

[Gustavo N. <nie...@us...>]

Update of /cvsroot/pybot/pybot/pybot
In directory usw-pr-cvs1:/tmp/cvs-serv20766

Modified Files:
	option.py 
Log Message:
- Fixed little bug in Options.getsoft() keepalive handling
- Implemented help module, offering an online help api for other modules
  (have a look at plock.py for an example).


Index: option.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/option.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** option.py	2001/11/02 17:20:21	1.1.1.1
--- option.py	2001/11/13 20:39:25	1.2
***************
*** 46,54 ****
  
  	def getsoft(self, name, default, keepalive=None):
  		opt = self.__soft.get(name)
  		if opt:
! 			if time() < opt[0]:
! 				if keepalive == 0:
! 					opt[0] = 0
  				elif keepalive:
  					opt[0] = time()+keepalive
--- 46,59 ----
  
  	def getsoft(self, name, default, keepalive=None):
+ 		"""Return temporary option.
+ 		You may define for how long the option will be considered
+ 		valid trough the keepalive argument (in seconds). If keepalive
+ 		is None (default), option will stay valid while pybot is up, or
+ 		at least until you change the keepalive to something else."""
  		opt = self.__soft.get(name)
  		if opt:
! 			if opt[0] is None or time() < opt[0]:
! 				if keepalive is None:
! 					opt[0] = None
  				elif keepalive:
  					opt[0] = time()+keepalive
***************
*** 56,62 ****
  			else:
  				del self.__soft[name]
! 		if keepalive == 0:
! 			self.__soft[name] = 0
! 		elif keepalive:
  			self.__soft[name] = [time()+keepalive, default]
  		return default
--- 61,67 ----
  			else:
  				del self.__soft[name]
! 		if keepalive is None:
! 			self.__soft[name] = [None, default]
! 		else:
  			self.__soft[name] = [time()+keepalive, default]
  		return default