CVS: tmda/TMDA ChangeLog,1.300,1.301 Pending.py,1.24,1.25

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

Modified Files:
	ChangeLog Pending.py 
Log Message:
Bugfix.  Change all the PENDING_*_APPEND variables to append the
x-primary-address rather than return-path if it exists.

Bug reported by Jeff Ross on tmda-users.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- ChangeLog	6 Dec 2003 01:31:46 -0000	1.300
+++ ChangeLog	9 Dec 2003 22:12:57 -0000	1.301
@@ -1,3 +1,22 @@
+2003-12-09  Jason R. Mastaler  <[email protected]>
+
+	* Pending.py (Message.initMessage): Remove unnecessary method, and
+	move that code into Message.__init__.
+
+	(Message.__init__): New variables x_primary_address and
+	append_address.
+
+	(Message.release): Append append_address instead of return_path.
+	(Message.delete): Ditto.
+	(Message.whitelist): Ditto.
+	(Message.blacklist): Ditto.
+		
+	(Queue.mainLoop): Remove call to Message.initMessage().
+	(Message.release): Ditto.
+	(Message.delete): Ditto.
+	(Message.whitelist): Ditto.
+	(Message.blacklist): Ditto.
+	
 2003-12-03  Jason R. Mastaler  <[email protected]>
 
 	* AutoResponse.py (AutoResponse.create): Add an RFC 2183

Index: Pending.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Pending.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Pending.py	6 Dec 2003 01:31:46 -0000	1.24
+++ Pending.py	9 Dec 2003 22:12:57 -0000	1.25
@@ -277,7 +277,7 @@
         for msgid in self.msgs:
             self.count = self.count + 1
             try:
-                M = Message(msgid, self.command_recipient).initMessage()
+                M = Message(msgid, self.command_recipient)
             except Errors.MessageError, obj:
                 self.cPrint(obj)
                 continue
@@ -426,24 +426,18 @@
         except email.Errors.BoundaryError:
             self.msgobj = Util.msg_from_file(open(self.msgfile, 'r'))
         self.recipient = recipient
-
-    def initMessage(self, recipient = None):
-        self.return_path = parseaddr(self.msgobj.get('return-path'))[1]
-        if not recipient and not self.recipient:
+        if self.recipient is None:
             self.recipient = self.msgobj.get('x-tmda-recipient')
-        else:
-            self.recipient = recipient
-        return self
+        self.return_path = parseaddr(self.msgobj.get('return-path'))[1]
+        self.x_primary_address = parseaddr(self.msgobj.get('x-primary-address'))[1]
+        self.append_address = Util.confirm_append_address(
+            self.x_primary_address, self.return_path)
 
     def release(self):
         """Release a message from the pending queue."""
-        try:
-            self.return_path
-        except:
-            self.initMessage()
         import Cookie
         if Defaults.PENDING_RELEASE_APPEND:
-            Util.append_to_file(self.return_path,
+            Util.append_to_file(self.append_address,
                                 Defaults.PENDING_RELEASE_APPEND)
         timestamp, pid, suffix = self.msgid.split('.')
         # Remove Return-Path: to avoid duplicates.
@@ -467,23 +461,15 @@
 
     def delete(self):
         """Delete a message from the pending queue."""
-        try:
-            self.return_path
-        except:
-            self.initMessage()
         if Defaults.PENDING_DELETE_APPEND:
-            Util.append_to_file(self.return_path,
+            Util.append_to_file(self.append_address,
                                 Defaults.PENDING_DELETE_APPEND)
         os.unlink(self.msgfile)
 
     def whitelist(self):
         """Whitelist the message sender."""
-        try:
-            self.return_path
-        except:
-            self.initMessage()
         if Defaults.PENDING_WHITELIST_APPEND:
-            Util.append_to_file(self.return_path,
+            Util.append_to_file(self.append_address,
                                 Defaults.PENDING_WHITELIST_APPEND)
         else:
             raise Errors.ConfigError, \
@@ -491,12 +477,8 @@
 
     def blacklist(self):
         """Blacklist the message sender."""
-        try:
-            self.return_path
-        except:
-            self.initMessage()
         if Defaults.PENDING_BLACKLIST_APPEND:
-            Util.append_to_file(self.return_path,
+            Util.append_to_file(self.append_address,
                                 Defaults.PENDING_BLACKLIST_APPEND)
         else:
             raise Errors.ConfigError, \