[Spambayes-checkins] spambayes/spambayes tokenizer.py,1.31,1.32

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17978/spambayes

Modified Files:
	tokenizer.py 
Log Message:
Goodbye to support code for two deprecated options: [Tokenizer] x-extract_dow
and [Tokenizer] x-generate_time_buckets.  No-one objected on the list (and some
agreed), and they've been deprecated for a while.

Index: tokenizer.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/tokenizer.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** tokenizer.py	12 Feb 2004 22:07:55 -0000	1.31
--- tokenizer.py	5 Aug 2004 00:56:53 -0000	1.32
***************
*** 1469,1498 ****
                              yield 'received:' + tok
  
-         # Date:
-         if options["Tokenizer", "x-generate_time_buckets"]:
-             for header in msg.get_all("date", ()):
-                 mat = self.date_hms_re.search(header)
-                 # return the time in Date: headers arranged in
-                 # 10-minute buckets
-                 if mat is not None:
-                     h = int(mat.group('hour'))
-                     bucket = int(mat.group('minute')) // 10
-                     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
-                 for fmt in self.date_formats:
-                     try:
-                         timetuple = time.strptime(header, fmt)
-                     except ValueError:
-                         pass
-                     else:
-                         yield 'dow:%d' % timetuple[6]
-                         break
-                 else:
-                     # if nothing matches, declare the Date: header invalid
-                     yield 'dow:invalid'
- 
          # Message-Id:  This seems to be a small win and should not
          # adversely affect a mixed source corpus so it's always enabled.
--- 1469,1472 ----