CVS: tmda/TMDA ChangeLog, 1.303, 1.304 Cookie.py, 1.26, 1.27 Defaults.py, 1.189, 1.190

Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1:/tmp/cvs-serv493/TMDA

Modified Files:
	ChangeLog Cookie.py Defaults.py 
Log Message:
'TIMEOUT' is a historical relic from TMDA's early days, but now it is
too easily confused with other aspects of the system.  It applies only
to dated style tagged addresses, so we rename it 'DATED_TIMEOUT' to
reduce confusion.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- ChangeLog	9 Jan 2004 19:23:15 -0000	1.303
+++ ChangeLog	9 Jan 2004 19:36:26 -0000	1.304
@@ -1,5 +1,7 @@
 2004-01-09  Jason R. Mastaler  <[email protected]>
 
+	* Defaults.py (DATED_TIMEOUT): TIMEOUT renamed.
+
 	* Util.py (confirm_append_address): Return the envelope sender
 	address immediately if either the Return-Path address or
 	X-Primary-Address is not in user@hostname format.

Index: Cookie.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Cookie.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Cookie.py	1 Jan 2004 23:22:19 -0000	1.26
+++ Cookie.py	9 Jan 2004 19:36:26 -0000	1.27
@@ -74,7 +74,7 @@
 def make_dated_cookie(time, timeout = None):
     """Return a dated-style cookie (expire date + HMAC)."""
     tmda_timeout = timeout or os.environ.get('TMDA_TIMEOUT')
-    if not tmda_timeout:tmda_timeout = Defaults.TIMEOUT
+    if not tmda_timeout:tmda_timeout = Defaults.DATED_TIMEOUT
     expire_time = str(int(time) + Util.seconds(tmda_timeout))
     datedmac = datemac(expire_time)
     return expire_time + '.' + datedmac

Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- Defaults.py	1 Jan 2004 23:22:19 -0000	1.189
+++ Defaults.py	9 Jan 2004 19:36:26 -0000	1.190
@@ -1469,13 +1469,13 @@
 if not vars().has_key('SUMMARY_HEADERS'):
     SUMMARY_HEADERS = ['date', 'from', 'to', 'subject']
 
-# TIMEOUT
+# DATED_TIMEOUT
 # The timeout interval for 'dated' addresses.  The available units are
 # (Y=years, M=months, w=weeks, d=days, h=hours, m=minutes, s=seconds).
 #
 # Default is 5d (5 days).
-if not vars().has_key('TIMEOUT'):
-    TIMEOUT = "5d"
+if not vars().has_key('DATED_TIMEOUT'):
+    DATED_TIMEOUT = "5d"
 
 # USERNAME
 # The left-hand side of your e-mail address (before `@').