[Spambayes-checkins] spambayes/spambayes tokenizer.py,1.14,1.15

[Skip Montanaro]

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

Modified Files:
	tokenizer.py 
Log Message:
worm around possible email pkg bug - see code comment for msg thread


Index: tokenizer.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/tokenizer.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tokenizer.py	5 Sep 2003 01:15:28 -0000	1.14
--- tokenizer.py	18 Sep 2003 21:00:10 -0000	1.15
***************
*** 805,813 ****
          yield 'content-disposition:' + x.lower()
  
!     fname = msg.get_filename()
!     if fname is not None:
!         for x in crack_filename(fname):
!             yield 'filename:' + x
! 
      if 0:   # disabled; see comment before function
          x = msg.get('content-transfer-encoding')
--- 805,820 ----
          yield 'content-disposition:' + x.lower()
  
!     try:
!         fname = msg.get_filename()
!         if fname is not None:
!             for x in crack_filename(fname):
!                 yield 'filename:' + x
!     except TypeError:
!         # bug in email pkg?  see the thread beginning at
!         # http://mail.python.org/pipermail/spambayes/2003-September/008006.html
!         # and
!         # http://mail.python.org/pipermail/spambayes-dev/2003-September/001177.html
!         yield "filename:<bogus>"
!         
      if 0:   # disabled; see comment before function
          x = msg.get('content-transfer-encoding')