Update of /cvsroot/tmda/tmda/TMDA/pythonlib/email
In directory sc8-pr-cvs1:/tmp/cvs-serv2076
Modified Files:
Header.py __init__.py
Log Message:
Sync email with Python CVS (v2.5.1).
Index: Header.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/pythonlib/email/Header.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Header.py 17 Mar 2003 20:48:29 -0000 1.8
+++ Header.py 31 Mar 2003 18:43:47 -0000 1.9
@@ -215,11 +215,11 @@
# charset. Only do this for the second and subsequent chunks.
nextcs = charset
if uchunks:
- if lastcs is not None:
- if nextcs is None or nextcs == 'us-ascii':
+ if lastcs not in (None, 'us-ascii'):
+ if nextcs in (None, 'us-ascii'):
uchunks.append(USPACE)
nextcs = None
- elif nextcs is not None and nextcs <> 'us-ascii':
+ elif nextcs not in (None, 'us-ascii'):
uchunks.append(USPACE)
lastcs = nextcs
uchunks.append(unicode(s, str(charset)))
Index: __init__.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/pythonlib/email/__init__.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- __init__.py 26 Mar 2003 19:02:09 -0000 1.8
+++ __init__.py 31 Mar 2003 18:43:48 -0000 1.9
@@ -4,7 +4,7 @@
"""A package for parsing, handling, and generating email messages.
"""
-__version__ = '2.5+'
+__version__ = '2.5.1'
__all__ = [
'base64MIME',
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
