[Spambayes-checkins] spambayes mboxcount.py,1.1,1.2

[Skip Montanaro]

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

Modified Files:
	mboxcount.py 
Log Message:
replace _factory() with mboxutils.get_message()


Index: mboxcount.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/mboxcount.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mboxcount.py	5 Sep 2002 16:16:43 -0000	1.1
--- mboxcount.py	6 Nov 2002 01:58:35 -0000	1.2
***************
*** 34,40 ****
  import glob
  
! program = sys.argv[0]
  
! _marker = object()
  
  def usage(code, msg=''):
--- 34,40 ----
  import glob
  
! from mboxutils import get_message
  
! program = sys.argv[0]
  
  def usage(code, msg=''):
***************
*** 44,60 ****
      sys.exit(code)
  
- def _factory(fp):
-     try:
-         return email.message_from_file(fp)
-     except email.Errors.MessageParseError:
-         return _marker
- 
  def count(fname):
      fp = open(fname, 'rb')
!     mbox = mailbox.PortableUnixMailbox(fp, _factory)
      goodcount = 0
      badcount = 0
      for msg in mbox:
!         if msg is _marker:
              badcount += 1
          else:
--- 44,54 ----
      sys.exit(code)
  
  def count(fname):
      fp = open(fname, 'rb')
!     mbox = mailbox.PortableUnixMailbox(fp, get_message)
      goodcount = 0
      badcount = 0
      for msg in mbox:
!         if msg["to"] is None and msg["cc"] is None:
              badcount += 1
          else: