[Spambayes-checkins] spambayes pop3proxy.py,1.63,1.64 smtpproxy.py,1.2,1.3

[Tony Meyer]

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

Modified Files:
	pop3proxy.py smtpproxy.py 
Log Message:
Added pop3proxy_include_prob, which notes the score/prob in the classification header (off by default).  While I'm here, a couple of typos and a todo in smtpproxy as well.

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** pop3proxy.py	6 Mar 2003 18:42:49 -0000	1.63
--- pop3proxy.py	9 Mar 2003 23:55:27 -0000	1.64
***************
*** 72,76 ****
     webbrowser?
   o Can it cleanly dynamically update its status display while having a
!    POP3 converation?  Hammering reload sucks.
   o Save the stats (num classified, etc.) between sessions.
   o "Reload database" button.
--- 72,76 ----
     webbrowser?
   o Can it cleanly dynamically update its status display while having a
!    POP3 conversation?  Hammering reload sucks.
   o Save the stats (num classified, etc.) between sessions.
   o "Reload database" button.
***************
*** 513,518 ****
              else:
                  id_header = options.hammie_header_name + "-ID: Test\r\n"
!                             
!             header = '%s: %s\r\n' % (options.hammie_header_name, disposition)
              headers = headers + "\n" + header + id_header + "\r\n"
              
--- 513,522 ----
              else:
                  id_header = options.hammie_header_name + "-ID: Test\r\n"
! 
!             if options.pop3proxy_include_prob:
!                 header = '%s: %s, %s\r\n' % (options.hammie_header_name,
!                                              disposition, prob)
!             else:
!                 header = '%s: %s\r\n' % (options.hammie_header_name, disposition)
              headers = headers + "\n" + header + id_header + "\r\n"
              

Index: smtpproxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/smtpproxy.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** smtpproxy.py	3 Mar 2003 04:38:31 -0000	1.2
--- smtpproxy.py	9 Mar 2003 23:55:27 -0000	1.3
***************
*** 28,31 ****
--- 28,37 ----
  
  todo = """
+ It would be nice if spam/ham could be bulk forwarded to the proxy,
+ rather than one by one.  This would require separating the different
+ messages and extracting the correct ids.  Simply changing to find
+ *all* the ids in a message, rather than stopping after one *might*
+ work, but I don't really know.  Richie Hindle suggested something along
+ these lines back in September '02.
  
  Testing: