[Spambayes-checkins] spambayes/spambayes smtpproxy.py,1.3,1.4

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv19746/spambayes

Modified Files:
	smtpproxy.py 
Log Message:
Fix [ 810342 ] sb_smtpproxy does not work with smtplib.SMTP.sendmail()

(We were sending the wrong response to a DATA command).

Index: smtpproxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/smtpproxy.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** smtpproxy.py	29 Sep 2003 05:09:00 -0000	1.3
--- smtpproxy.py	3 Oct 2003 05:17:43 -0000	1.4
***************
*** 338,347 ****
          self.inData = True
          if self.train_as_ham == True or self.train_as_spam == True:
!             self.push("250 OK\r\n")
              return None
!         rv = command
!         for arg in args:
!             rv += ' ' + arg
!         return rv
  
      def onMailFrom(self, command, args):
--- 338,344 ----
          self.inData = True
          if self.train_as_ham == True or self.train_as_spam == True:
!             self.push("354 Enter data ending with a . on a line by itself\r\n")
              return None
!         return command + ' ' + ' '.join(args)
  
      def onMailFrom(self, command, args):