[Spambayes-checkins] spambayes/scripts sb_server.py, 1.6, 1.7 sb_smtpproxy.py, 1.3, NONE

Tony Meyer anadelonbrin at users.sourceforge.net
Fri Sep 19 19:38:12 EDT 2003


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

Modified Files:
	sb_server.py 
Removed Files:
	sb_smtpproxy.py 
Log Message:
If anyone wants to use the smtp proxy, then they can do so via sb_server, with or
without using the pop3 proxy as well.  This means that sb_smtpproxy doesn't really
need to exist anymore, and the smtpproxy stuff would be better as a module.  Do this.

We had too many message classes!  As discussed (by me and Mark, mostly) a long
time back on spambayes-dev, start consolidating these (I was waiting for 1.1).

Add the various interface improvements discussed on spambayes-dev.  In particular,
an advanced 'find token' query is available, the 'find message' query is improved,
and the review messages page is more customisable.

Index: sb_server.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_server.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sb_server.py	18 Sep 2003 03:58:59 -0000	1.6
--- sb_server.py	19 Sep 2003 23:38:10 -0000	1.7
***************
*** 477,481 ****
                          # Write the message into the Unknown cache.
                          message = state.unknownCorpus.makeMessage(msg.getId())
!                         message.setSubstance(msg.as_string())
                          state.unknownCorpus.addMessage(message)
  
--- 477,481 ----
                          # Write the message into the Unknown cache.
                          message = state.unknownCorpus.makeMessage(msg.getId())
!                         message.setPayload(msg.as_string())
                          state.unknownCorpus.addMessage(message)
  
***************
*** 493,497 ****
                  body = re.split(r'\n\r?\n', messageText, 1)[1]
                  messageText = "\r\n".join(headers) + "\r\n\r\n" + body
- 
              except:
                  # Something nasty happened while parsing or classifying -
--- 493,496 ----
***************
*** 751,758 ****
      # SMTP proxy information in their configuration, then nothing will
      # happen.
!     import sb_smtpproxy
!     servers, proxyPorts = sb_smtpproxy.LoadServerInfo()
!     proxyListeners.extend(sb_smtpproxy.CreateProxies(servers, proxyPorts,
!                                                      state))
  
      # setup info for the web interface
--- 750,757 ----
      # SMTP proxy information in their configuration, then nothing will
      # happen.
!     from spambayes import smtpproxy
!     servers, proxyPorts = smtpproxy.LoadServerInfo()
!     proxyListeners.extend(smtpproxy.CreateProxies(servers, proxyPorts,
!                                                   state))
  
      # setup info for the web interface

--- sb_smtpproxy.py DELETED ---





More information about the Spambayes-checkins mailing list