diff options
author | R. David Murray <rdmurray@bitdance.com> | 2010-06-16 02:22:56 (GMT) |
---|---|---|
committer | R. David Murray <rdmurray@bitdance.com> | 2010-06-16 02:22:56 (GMT) |
commit | 71df9d92161fda464f508cccb4c025b3c4a2c1b1 (patch) | |
tree | 3cab1ee51c98e116155bce4f1cc9f11bf3b297c2 /Misc | |
parent | 24d83873ebbeff5bad465457579cd0c5ef02676e (diff) | |
download | cpython-71df9d92161fda464f508cccb4c025b3c4a2c1b1.zip cpython-71df9d92161fda464f508cccb4c025b3c4a2c1b1.tar.gz cpython-71df9d92161fda464f508cccb4c025b3c4a2c1b1.tar.bz2 |
Merged revisions 82011 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r82011 | r.david.murray | 2010-06-15 22:19:40 -0400 (Tue, 15 Jun 2010) | 17 lines
Merged revisions 81675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81675 | r.david.murray | 2010-06-03 11:43:20 -0400 (Thu, 03 Jun 2010) | 10 lines
#5610: use \Z not $ so we don't eat extra chars when body part ends with \r\n.
If a body part ended with \r\n, feedparser, using '$' to terminate its
search for the newline, would match on the \r\n, and think that it needed
to strip two characters in order to account for the line end before the
boundary. That made it chop one too many characters off the end of
the body part. Using \Z makes the match correct.
Patch and test by Tony Nelson.
........
................
Diffstat (limited to 'Misc')
-rw-r--r-- | Misc/NEWS | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -61,6 +61,9 @@ C-API Library ------- +- Issue #5610: feedparser no longer eats extra characters at the end of + a body part if the body part ends with a \r\n. + - Fix codecs.escape_encode to return the correct consumed size. - Issue #8897: Fix sunau module, use bytes to write the header. Patch written |