[Spambayes-checkins] spambayes smtpproxy.py,1.10,1.11

[Tony Meyer]

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

Modified Files:
	smtpproxy.py 
Log Message:
An old option was left in by mistake, so remove that.
Wrong import in smtpproxy.py.
Remove the debugging information from smtpproxy.py - I think that these are all
resolved now, although there might be one more...

Index: smtpproxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/smtpproxy.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** smtpproxy.py	26 Aug 2003 02:29:40 -0000	1.10
--- smtpproxy.py	26 Aug 2003 06:49:56 -0000	1.11
***************
*** 139,143 ****
  from spambayes import Dibbler
  from spambayes import storage
! from spambayes.message import message_from_string
  from spambayes.tokenizer import textparts
  from spambayes.tokenizer import try_to_repair_damaged_base64
--- 139,143 ----
  from spambayes import Dibbler
  from spambayes import storage
! from spambayes.message import sbheadermessage_from_string
  from spambayes.tokenizer import textparts
  from spambayes.tokenizer import try_to_repair_damaged_base64
***************
*** 230,238 ****
              if cooked is not None:
                  self.serverSocket.push(cooked + '\r\n')
-                 if options["globals", "verbose"]:
-                     # XXX debugging information
-                     # XXX remove this once the problems are sorted out
-                     print "pulled", self.request
-                     print "pushed", cooked + '\r\n'
          self.command = self.args = self.request = ''
  
--- 230,233 ----