[Spambayes-checkins] spambayes smtpproxy.py,1.12,1.13

[Tony Meyer]

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

Modified Files:
	smtpproxy.py 
Log Message:
Suggested fix for [ 797316 ] Extra CRLF to smtp server causes garbage error.

Also remove a couple of debugging prints that snuck in.

Index: smtpproxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/smtpproxy.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** smtpproxy.py	28 Aug 2003 08:56:57 -0000	1.12
--- smtpproxy.py	1 Sep 2003 05:06:37 -0000	1.13
***************
*** 223,227 ****
                  self.data = ""
                  if self.blockData == False:
!                     self.serverSocket.push(cooked + '\r\n')
                  else:
                      self.push("250 OK\r\n")
--- 223,227 ----
                  self.data = ""
                  if self.blockData == False:
!                     self.serverSocket.push(cooked)
                  else:
                      self.push("250 OK\r\n")
***************
*** 230,235 ****
              if cooked is not None:
                  self.serverSocket.push(cooked + '\r\n')
-                 print "pulled: '%s'" % self.request
-                 print "pushed: '%s'" % cooked
          self.command = self.args = self.request = ''
  
--- 230,233 ----