[Spambayes-checkins] spambayes tokenizer.py,1.41,1.42

[Neil Schemenauer]

Update of /cvsroot/spambayes/spambayes
In directory usw-pr-cvs1:/tmp/cvs-serv8826

Modified Files:
	tokenizer.py 
Log Message:
Remove mine_message_ids option since it shouldn't hurt to always have it
enabled.


Index: tokenizer.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/tokenizer.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** tokenizer.py	27 Sep 2002 04:06:12 -0000	1.41
--- tokenizer.py	28 Sep 2002 18:48:52 -0000	1.42
***************
*** 984,996 ****
                              yield 'received:' + tok
  
!         if options.mine_message_ids:
!             msgid = msg.get("message-id", "")
!             m = message_id_re.match(msgid)
!             if not m:
!                 # might be weird instead of invalid but who cares?
!                 yield 'message-id:invalid'
!             else:
!                 # looks okay, return the hostname only
!                 yield 'message-id:@%s' % m.group(1)
  
          # As suggested by Anthony Baxter, merely counting the number of
--- 984,997 ----
                              yield 'received:' + tok
  
!         # Message-Id:  This seems to be a small win and should no
!         # adversely affect a mixed source corpus so it's always enabled.
!         msgid = msg.get("message-id", "")
!         m = message_id_re.match(msgid)
!         if m:
!             # looks okay, return the hostname
!             yield 'message-id:@%s' % m.group(1)
!         else:
!             # might be weird instead of invalid but who cares?
!             yield 'message-id:invalid'
  
          # As suggested by Anthony Baxter, merely counting the number of