[Spambayes-checkins] spambayes pop3proxy.py,1.15,1.16 Options.py,1.71,1.72

[Richie Hindle]

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

Modified Files:
	pop3proxy.py Options.py 
Log Message:
 o New web-based training interface for the POP3 proxy.
 o Fix for François' log-file-re-opening problem on the Mac.
 o Fix for François' classify-by-upload problem on the Mac.


Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** pop3proxy.py	13 Nov 2002 18:19:45 -0000	1.15
--- pop3proxy.py	18 Nov 2002 19:14:48 -0000	1.16
***************
*** 2,6 ****
  
  """A POP3 proxy that works with classifier.py, and adds a simple
! X-Hammie-Disposition header (Yes or No) to each incoming email.
  You point pop3proxy at your POP3 server, and configure your email
  client to collect mail from the proxy then filter on the added
--- 2,6 ----
  
  """A POP3 proxy that works with classifier.py, and adds a simple
! X-Hammie-Disposition header (Yes/No/Unsure) to each incoming email.
  You point pop3proxy at your POP3 server, and configure your email
[...995 lines suppressed...]
!         if not state.serverName:
              print >>sys.stderr, \
                    ("Error: You must give a POP3 server name, either in\n"
***************
*** 1141,1147 ****
                     "command line.  pop3server.py -h prints a usage message.")
          else:
!             main(status.serverName, status.serverPort, status.proxyPort,
!                  status.uiPort, status.launchUI, status.pickleName,
!                  status.useDB)
  
      else:
--- 1414,1420 ----
                     "command line.  pop3server.py -h prints a usage message.")
          else:
!             main(state.serverName, state.serverPort, state.proxyPort,
!                  state.uiPort, state.launchUI, state.databaseFilename,
!                  state.useDB)
  
      else:

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Options.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Options.py	18 Nov 2002 01:40:03 -0000	1.71
--- Options.py	18 Nov 2002 19:14:48 -0000	1.72
***************
*** 362,367 ****
  pop3proxy_server_port: 110
  pop3proxy_port: 110
! pop3proxy_cache_use_gzip: True
  pop3proxy_cache_expiry_days: 7
  
  [html_ui]
--- 362,370 ----
  pop3proxy_server_port: 110
  pop3proxy_port: 110
! pop3proxy_cache_use_gzip: False
  pop3proxy_cache_expiry_days: 7
+ pop3proxy_spam_cache: pop3proxy-spam-cache
+ pop3proxy_ham_cache: pop3proxy-ham-cache
+ pop3proxy_unknown_cache: pop3proxy-unknown-cache
  
  [html_ui]
***************
*** 443,446 ****
--- 446,452 ----
                    'pop3proxy_cache_use_gzip': boolean_cracker,
                    'pop3proxy_cache_expiry_days': int_cracker,
+                   'pop3proxy_spam_cache': string_cracker,
+                   'pop3proxy_ham_cache': string_cracker,
+                   'pop3proxy_unknown_cache': string_cracker,
                    },
      'html_ui': {'html_ui_port': int_cracker,