[Spambayes-checkins] spambayes/spambayes Options.py,1.17,1.18

[Tony Meyer]

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

Modified Files:
	Options.py 
Log Message:
Tidying up smtpproxy related pop3proxy options to use fewer variables and be more expandable.

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Options.py	27 Feb 2003 04:13:32 -0000	1.17
--- Options.py	1 Mar 2003 22:45:16 -0000	1.18
***************
*** 389,398 ****
  pop3proxy_persistent_storage_file: hammie.db
  pop3proxy_notate_to: False
! pop3proxy_add_mailid_header: False
  pop3proxy_mailid_header_name: X-Spambayes-MailId
- pop3proxy_mailid_as_header: False
- pop3proxy_mailid_in_msgbody: False
  pop3proxy_strip_incoming_mailids: False
- pop3proxy_notate_subject: False
  
  # Deprecated - use pop3proxy_servers and pop3proxy_ports instead.
--- 389,398 ----
  pop3proxy_persistent_storage_file: hammie.db
  pop3proxy_notate_to: False
! pop3proxy_notate_subject: False
! # valid options for pop3proxy_add_mailid_to include
! # "", "header", "body", and "header body"
! pop3proxy_add_mailid_to:
  pop3proxy_mailid_header_name: X-Spambayes-MailId
  pop3proxy_strip_incoming_mailids: False
  
  # Deprecated - use pop3proxy_servers and pop3proxy_ports instead.
***************
*** 508,517 ****
                    'pop3proxy_persistent_storage_file': string_cracker,
                    'pop3proxy_notate_to': boolean_cracker,
!                   'pop3proxy_add_mailid_header' : boolean_cracker,
                    'pop3proxy_mailid_header_name' : string_cracker,
-                   'pop3proxy_mailid_as_header' : boolean_cracker,
-                   'pop3proxy_mailid_in_msgbody' : boolean_cracker,
                    'pop3proxy_strip_incoming_mailids' : boolean_cracker,
-                   'pop3proxy_notate_subject': boolean_cracker,
                    },
      'smtpproxy': {'smtpproxy_ham_address' : string_cracker,
--- 508,515 ----
                    'pop3proxy_persistent_storage_file': string_cracker,
                    'pop3proxy_notate_to': boolean_cracker,
!                   'pop3proxy_notate_subject': boolean_cracker,
!                   'pop3proxy_add_mailid_to' : string_cracker,
                    'pop3proxy_mailid_header_name' : string_cracker,
                    'pop3proxy_strip_incoming_mailids' : boolean_cracker,
                    },
      'smtpproxy': {'smtpproxy_ham_address' : string_cracker,