Update of /cvsroot/tmda/tmda/TMDA
In directory usw-pr-cvs1:/tmp/cvs-serv4896/TMDA

Modified Files:
        AutoResponse.py ChangeLog Defaults.py 
Log Message:
Rename:
AUTORESPONSE_TEMPLATE_EMAIL_HEADERS --> TEMPLATE_EMAIL_HEADERS
AUTORESPONSE_TEMPLATE_ENCODED_HEADERS --> TEMPLATE_ENCODED_HEADERS


Index: AutoResponse.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/AutoResponse.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AutoResponse.py     21 Oct 2002 19:10:29 -0000      1.3
+++ AutoResponse.py     24 Oct 2002 17:52:10 -0000      1.4
@@ -149,7 +149,7 @@
             # might need the "Fullname" portion encoded, but the
             # address portion must _not_ be encoded.
             if k.lower() in map(lambda s: s.lower(),
-                                Defaults.AUTORESPONSE_TEMPLATE_EMAIL_HEADERS):
+                                Defaults.TEMPLATE_EMAIL_HEADERS):
                 name, addr = parseaddr(v)
                 if name:
                     h = Header(name, hdrcharset)
@@ -159,7 +159,7 @@
             # so we need to decode that first before encoding the
             # entire header value.
             elif k.lower() in map(lambda s: s.lower(),
-                                  Defaults.AUTORESPONSE_TEMPLATE_ENCODED_HEADERS):
+                                  Defaults.TEMPLATE_ENCODED_HEADERS):
                 h = Header(charset=hdrcharset, header_name=k)
                 decoded_seq = decode_header(v)
                 for s, charset in decoded_seq:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- ChangeLog   18 Oct 2002 22:36:16 -0000      1.234
+++ ChangeLog   24 Oct 2002 17:52:11 -0000      1.235
@@ -5,8 +5,8 @@
        
        * Defaults.py (AUTORESPONSE_INCLUDE_SENDER_COPY): New variable.
 
-       (AUTORESPONSE_TEMPLATE_EMAIL_HEADERS): Ditto.
-       (AUTORESPONSE_TEMPLATE_ENCODED_HEADERS): Ditto.
+       (TEMPLATE_EMAIL_HEADERS): Ditto.
+       (TEMPLATE_ENCODED_HEADERS): Ditto.
 
        * AutoResponse.py: New file.
 

Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- Defaults.py 18 Oct 2002 22:36:16 -0000      1.147
+++ Defaults.py 24 Oct 2002 17:52:11 -0000      1.148
@@ -545,6 +545,31 @@
 if not vars().has_key('TEMPLATE_DIR'):
     TEMPLATE_DIR = None
 
+# TEMPLATE_EMAIL_HEADERS
+# A list containing the names of headers in your templates that
+# contain an e-mail address.  This is necessary so that the e-mail
+# address will avoid being RFC 2047 encoded when handling
+# internationalized headers.
+#
+# Example:
+# TEMPLATE_EMAIL_HEADERS = ["from", "reply-to"]
+#
+# Default is "From:" and "Reply-To:".
+if not vars().has_key('TEMPLATE_EMAIL_HEADERS'):
+    TEMPLATE_EMAIL_HEADERS = ['from', 'reply-to']
+
+# TEMPLATE_ENCODED_HEADERS
+# A list containing the names of headers in your templates that might
+# contain an RFC 2047 encoded string.  This is necessary so that they
+# can be decoded first when handling internationalized headers.
+#
+# Example:
+# TEMPLATE_ENCODED_HEADERS = ["subject"]
+#
+# Default is "Subject:".
+if not vars().has_key('TEMPLATE_ENCODED_HEADERS'):
+    TEMPLATE_ENCODED_HEADERS = ['subject']
+
 # DATED_TEMPLATE_VARS
 # Set this variable to 1 if you want to use 'dated' address variables
 # in your templates.
@@ -930,31 +955,6 @@
 # Default is 2
 if not vars().has_key('AUTORESPONSE_INCLUDE_SENDER_COPY'):
     AUTORESPONSE_INCLUDE_SENDER_COPY = 2
-
-# AUTORESPONSE_TEMPLATE_EMAIL_HEADERS
-# A list containing the names of headers in your templates that
-# contain an e-mail address.  This is necessary so that the e-mail
-# address will avoid being RFC 2047 encoded when handling
-# internationalized headers.
-#
-# Example:
-# AUTORESPONSE_TEMPLATE_EMAIL_HEADERS = ["from", "reply-to"]
-#
-# Default is "From:" and "Reply-To:".
-if not vars().has_key('AUTORESPONSE_TEMPLATE_EMAIL_HEADERS'):
-    AUTORESPONSE_TEMPLATE_EMAIL_HEADERS = ['from', 'reply-to']
-
-# AUTORESPONSE_TEMPLATE_ENCODED_HEADERS
-# A list containing the names of headers in your templates that might
-# contain an RFC 2047 encoded string.  This is necessary so that they
-# can be decoded first when handling internationalized headers.
-#
-# Example:
-# AUTORESPONSE_TEMPLATE_ENCODED_HEADERS = ["subject"]
-#
-# Default is "Subject:".
-if not vars().has_key('AUTORESPONSE_TEMPLATE_ENCODED_HEADERS'):
-    AUTORESPONSE_TEMPLATE_ENCODED_HEADERS = ['subject']
 
 # DELIVERED_CACHE
 # Path to the cache file used to keep track of which messages have

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs

Reply via email to