[Spambayes-checkins] spambayes/spambayes tokenizer.py,1.19,1.20

[Tony Meyer]

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

Modified Files:
	tokenizer.py 
Log Message:
An x'ified option can only be referred to without the 'x-' when reading
from the file, not otherwise!  Fix this wrt the habeas code.

Index: tokenizer.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/tokenizer.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tokenizer.py	15 Dec 2003 08:16:26 -0000	1.19
--- tokenizer.py	15 Dec 2003 08:33:34 -0000	1.20
***************
*** 1139,1143 ****
  
          # Habeas Headers - see http://www.habeas.com
!         if options["Tokenizer", "search_for_habeas_headers"]:
              habeas_headers = [
  ("X-Habeas-SWE-1", "winter into spring"),
--- 1139,1143 ----
  
          # Habeas Headers - see http://www.habeas.com
!         if options["Tokenizer", "X-search_for_habeas_headers"]:
              habeas_headers = [
  ("X-Habeas-SWE-1", "winter into spring"),
***************
*** 1156,1160 ****
                  habeas = msg.get(opt)
                  if habeas is not None:
!                     if options["Tokenizer", "reduce_habeas_headers"]:
                          if habeas == val:
                              valid_habeas += 1
--- 1156,1160 ----
                  habeas = msg.get(opt)
                  if habeas is not None:
!                     if options["Tokenizer", "X-reduce_habeas_headers"]:
                          if habeas == val:
                              valid_habeas += 1
***************
*** 1166,1170 ****
                          else:
                              yield opt.lower() + ":invalid"
!             if options["Tokenizer", "reduce_habeas_headers"]:
                  # If there was any invalid line, we record as invalid.
                  # If all nine lines were correct, we record as valid.
--- 1166,1170 ----
                          else:
                              yield opt.lower() + ":invalid"
!             if options["Tokenizer", "X-reduce_habeas_headers"]:
                  # If there was any invalid line, we record as invalid.
                  # If all nine lines were correct, we record as valid.