[Python-checkins] python/dist/src/Lib/email Message.py,1.9.6.3,1.9.6.4 __init__.py,1.4.10.6,1.4.10.7 _parseaddr.py,1.5.2.1,1.5.2.2

[bwarsaw@users.sourceforge.net]

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

Modified Files:
      Tag: release22-maint
	Message.py __init__.py _parseaddr.py 
Log Message:
Backporting email 2.5.2 fixes.


Index: Message.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/Message.py,v
retrieving revision 1.9.6.3
retrieving revision 1.9.6.4
diff -C2 -d -r1.9.6.3 -r1.9.6.4
*** Message.py	21 Mar 2003 21:09:31 -0000	1.9.6.3
--- Message.py	8 May 2003 04:00:04 -0000	1.9.6.4
***************
*** 103,106 ****
--- 103,110 ----
          Optional `unixfrom' when True, means include the Unix From_ envelope
          header.
+ 
+         This is a convenience method and may not generate the message exactly
+         as you intend.  For more flexibility, use the flatten() method of a
+         Generator instance.
          """
          from email.Generator import Generator

Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/__init__.py,v
retrieving revision 1.4.10.6
retrieving revision 1.4.10.7
diff -C2 -d -r1.4.10.6 -r1.4.10.7
*** __init__.py	4 Apr 2003 02:47:07 -0000	1.4.10.6
--- __init__.py	8 May 2003 04:00:05 -0000	1.4.10.7
***************
*** 5,9 ****
  """
  
! __version__ = '2.5.1'
  
  __all__ = [
--- 5,9 ----
  """
  
! __version__ = '2.5.2'
  
  __all__ = [

Index: _parseaddr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/email/_parseaddr.py,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** _parseaddr.py	21 Mar 2003 21:09:31 -0000	1.5.2.1
--- _parseaddr.py	8 May 2003 04:00:05 -0000	1.5.2.2
***************
*** 55,61 ****
      else:
          i = data[0].rfind(',')
!         if i < 0:
!             return None
!         data[0] = data[0][i+1:]
      if len(data) == 3: # RFC 850 date, deprecated
          stuff = data[0].split('-')
--- 55,60 ----
      else:
          i = data[0].rfind(',')
!         if i >= 0:
!             data[0] = data[0][i+1:]
      if len(data) == 3: # RFC 850 date, deprecated
          stuff = data[0].split('-')