[Python-checkins] python/dist/src/Lib/email Parser.py,1.8,1.9

[bwarsaw@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/email
In directory usw-pr-cvs1:/tmp/cvs-serv27847/email

Modified Files:
	Parser.py 
Log Message:
_parsebody(): Fix for the new message/rfc822 tree structure (the
parent is now a multipart with one element, the sub-message object).


Index: Parser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/Parser.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Parser.py	19 May 2002 23:51:50 -0000	1.8
--- Parser.py	2 Jun 2002 19:12:03 -0000	1.9
***************
*** 9,15 ****
  from types import ListType
  
! # Intrapackage imports
! import Errors
! import Message
  
  EMPTYSTRING = ''
--- 9,14 ----
  from types import ListType
  
! from email import Errors
! from email import Message
  
  EMPTYSTRING = ''
***************
*** 177,181 ****
                  msg = self._class()
                  self._parsebody(msg, fp)
!             container.set_payload(msg)
          else:
              container.set_payload(fp.read())
--- 176,180 ----
                  msg = self._class()
                  self._parsebody(msg, fp)
!             container.attach(msg)
          else:
              container.set_payload(fp.read())