summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-06-16 00:57:25 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-06-16 00:57:25 (GMT)
commitff4a01dfaf246bca560f16be35b21130cab43547 (patch)
tree8babf5213894d1d9e66880e8f7f2ad9e09c1f9de /Misc
parent27e33fcd52ee2e15c0693c0e57344336df245c1c (diff)
downloadcpython-ff4a01dfaf246bca560f16be35b21130cab43547.zip
cpython-ff4a01dfaf246bca560f16be35b21130cab43547.tar.gz
cpython-ff4a01dfaf246bca560f16be35b21130cab43547.tar.bz2
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/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index fee5682..a9cd9bd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -71,6 +71,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.
+
- Issue #8924: logging: Improved error handling for Unicode in exception text.
- Fix codecs.escape_encode to return the correct consumed size.