[Spambayes-checkins] spambayes/spambayes message.py,1.63,1.64

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13741/spambayes

Modified Files:
	message.py 
Log Message:
My patch for Python 2.4 compatibility for the setPayload function wouldn't work. 
 This version should.  (Need to update the __dict__, note replace it).

Index: message.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/message.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** message.py	21 Dec 2004 21:37:06 -0000	1.63
--- message.py	21 Dec 2004 23:12:11 -0000	1.64
***************
*** 322,326 ****
                        DeprecationWarning, 2)
          new_me = email.message_from_string(payload, _class=Message)
!         self.__dict__ = new_me.__dict__
  
      def setId(self, id):
--- 322,326 ----
                        DeprecationWarning, 2)
          new_me = email.message_from_string(payload, _class=Message)
!         self.__dict__.update(new_me.__dict__)
  
      def setId(self, id):
***************
*** 422,426 ****
                        DeprecationWarning, 2)
          new_me = email.message_from_string(payload, _class=SBHeaderMessage)
!         self.__dict__ = new_me.__dict__
  
      def setIdFromPayload(self):
--- 422,426 ----
                        DeprecationWarning, 2)
          new_me = email.message_from_string(payload, _class=SBHeaderMessage)
!         self.__dict__.update(new_me.__dict__)
  
      def setIdFromPayload(self):