Header lines that end in \r\n only get the \n stripped,
not the \r (unless it's the last header which does get
the \r stripped):

>>> import email.Parser
>>> m = 'Header: text\r\nNext-Header: more
text\r\n\r\nBody\r\n\r\n'
>>> msg = email.Parser.Parser().parsestr(m)
>>> msg.get('header')
'text\r'
>>> msg.get('next-header')
'more text'
>>>

This bug showed itself in my SpamBayes setup using
sb_imapfilter.py where base64-encoded text/html
messages were not decoded in Message.get_payload
because the call to get('content-transfer-encoding')
returned the string 'base64\r' instead of 'base64'.

Logged In: YES 
user_id=552329

A patch to fix this is in:

[ 1003693 ] Fix for 1002475 (Feedparser not handling \r\n
correctly)
http://sourceforge.net/tracker/index.php?func=detail&aid=1003693&group_id=5470&atid=305470

I'll try to write a test for it, too, and also attach that.

Logged In: YES 
user_id=43607

The patch seems to work well.  +1 for checking it in.

Logged In: YES 
user_id=12800

Patch looks good to me.  Accepted and checked in.

test_email.py 1.59
FeedParser.py 1.9