[Spambayes-checkins] spambayes/spambayes tokenizer.py, 1.16, 1.17 Options.py, 1.83, 1.84

[Skip Montanaro]

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

Modified Files:
	tokenizer.py Options.py 
Log Message:
deprecate generate_time_buckets and extract_dow


Index: tokenizer.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/tokenizer.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tokenizer.py	9 Dec 2003 15:36:29 -0000	1.16
--- tokenizer.py	9 Dec 2003 16:04:16 -0000	1.17
***************
*** 1292,1296 ****
  
          # Date:
!         if options["Tokenizer", "generate_time_buckets"]:
              for header in msg.get_all("date", ()):
                  mat = self.date_hms_re.search(header)
--- 1292,1296 ----
  
          # Date:
!         if options["Tokenizer", "x-generate_time_buckets"]:
              for header in msg.get_all("date", ()):
                  mat = self.date_hms_re.search(header)
***************
*** 1302,1306 ****
                      yield 'time:%02d:%d' % (h, bucket)
  
!         if options["Tokenizer", "extract_dow"]:
              for header in msg.get_all("date", ()):
                  # extract the day of the week
--- 1302,1306 ----
                      yield 'time:%02d:%d' % (h, bucket)
  
!         if options["Tokenizer", "x-extract_dow"]:
              for header in msg.get_all("date", ()):
                  # extract the day of the week

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** Options.py	21 Oct 2003 21:42:22 -0000	1.83
--- Options.py	9 Dec 2003 16:04:16 -0000	1.84
***************
*** 137,147 ****
       INTEGER, RESTORE),
  
!     ("generate_time_buckets", "Generate time buckets", False,
!      """Generate tokens which resemble the posting time in 10-minute
!      buckets:  'time:'  hour  ':'  minute//10""",
       BOOLEAN, RESTORE),
  
!     ("extract_dow", "Extract day-of-week", False,
!      """Extract day of the week tokens from the Date: header.""",
       BOOLEAN, RESTORE),
  
--- 137,147 ----
       INTEGER, RESTORE),
  
!     ("X-generate_time_buckets", "Generate time buckets", False,
!      """(DEPRECATED) Generate tokens which resemble the posting time
!      in 10-minute buckets:  'time:'  hour  ':'  minute//10""",
       BOOLEAN, RESTORE),
  
!     ("X-extract_dow", "Extract day-of-week", False,
!      """(DEPRECATED) Extract day of the week tokens from the Date: header.""",
       BOOLEAN, RESTORE),