CVS: tmda/TMDA ChangeLog,1.296,1.297 AutoResponse.py,1.14,1.15

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

Modified Files:
	ChangeLog AutoResponse.py 
Log Message:
Made msgin_as_string a member (instead of a local) in
AutoResponse.__init__.  It was once a member, then switched to a local
with the change of 2003-11-11.  Then the change of 2003-11-16 used it
in create, but it wasn't changed back to a member.  This is now fixed.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- ChangeLog	20 Nov 2003 01:31:52 -0000	1.296
+++ ChangeLog	3 Dec 2003 07:37:54 -0000	1.297
@@ -1,3 +1,11 @@
+2003-12-03  Tim Legant  <[email protected]>
+
+	* AutoResponse.py (AutoResponse.__init__): Made msgin_as_string a
+	member (instead of a local).  It was once a member, then switched
+	to a local with the change of 2003-11-11.  Then the change of
+	2003-11-16 used it in create, but it wasn't changed back to a
+	member.
+
 2003-11-19  Tim Legant  <[email protected]>
 
 	* Errors.py (AddressError, QueueError): In the last change I

Index: AutoResponse.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/AutoResponse.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AutoResponse.py	16 Nov 2003 22:08:55 -0000	1.14
+++ AutoResponse.py	3 Dec 2003 07:37:54 -0000	1.15
@@ -72,22 +72,22 @@
         recipient is the recipient e-mail address of this auto
         response.  Normally the envelope sender address.
         """
-        msgin_as_string = Util.msg_as_string(msgin)
+        self.msgin_as_string = Util.msg_as_string(msgin)
         # Only do this step if the user wants to include the entire message.
         if Defaults.AUTORESPONSE_INCLUDE_SENDER_COPY > 1:
             max_msg_size = int(Defaults.CONFIRM_MAX_MESSAGE_SIZE)
             # Don't include the payload if it's over a certain size.
-            if max_msg_size and max_msg_size < len(msgin_as_string):
+            if max_msg_size and max_msg_size < len(self.msgin_as_string):
                 msgin.set_payload('[ Message body suppressed '
                                   '(exceeded %s bytes) ]' % max_msg_size)
-                msgin_as_string = Util.msg_as_string(msgin)
+                self.msgin_as_string = Util.msg_as_string(msgin)
             # Now try to re-parse the message with a full parse (not a
             # header-only parse) and store that as self.msgin.  If the full
             # parse fails, there is no choice but to use the header-parsed
             # version, so to prevent later Generator failures, we reset
             # AUTORESPONSE_INCLUDE_SENDER_COPY to include only the headers.
             try:
-                self.msgin = message_from_string(msgin_as_string)
+                self.msgin = message_from_string(self.msgin_as_string)
             except (KeyError, MessageError, TypeError, ValueError):
                 self.msgin = msgin
                 Defaults.AUTORESPONSE_INCLUDE_SENDER_COPY = 1