diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-07-17 01:40:30 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-07-17 01:40:30 (GMT) |
| commit | edc0d2338d4df38ddf9d9d37d7d0f0e14d9fc628 (patch) | |
| tree | b379fcdf6dadf6fd8a1606f7c207708052c3a7d7 /Lib/email/feedparser.py | |
| parent | 73ae8dde6f68862d4d280c6c34c6548ca66e8698 (diff) | |
| download | cpython-edc0d2338d4df38ddf9d9d37d7d0f0e14d9fc628.zip cpython-edc0d2338d4df38ddf9d9d37d7d0f0e14d9fc628.tar.gz cpython-edc0d2338d4df38ddf9d9d37d7d0f0e14d9fc628.tar.bz2 | |
Merged revisions 82924 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r82924 | r.david.murray | 2010-07-16 21:35:16 -0400 (Fri, 16 Jul 2010) | 11 lines
Merged revisions 82922 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82922 | r.david.murray | 2010-07-16 21:19:57 -0400 (Fri, 16 Jul 2010) | 4 lines
#1555570: correctly handle a \r\n that is split by the read buffer.
Patch and test by Tony Nelson.
........
................
Diffstat (limited to 'Lib/email/feedparser.py')
| -rw-r--r-- | Lib/email/feedparser.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py index 163fada..5ff266f 100644 --- a/Lib/email/feedparser.py +++ b/Lib/email/feedparser.py @@ -104,6 +104,10 @@ class BufferedSubFile(object): # data after the final RE. In the case of a NL/CR terminated string, # this is the empty string. self._partial = parts.pop() + #GAN 29Mar09 bugs 1555570, 1721862 Confusion at 8K boundary ending with \r: + # is there a \n to follow later? + if not self._partial and parts and parts[-1].endswith('\r'): + self._partial = parts.pop(-2)+parts.pop() # parts is a list of strings, alternating between the line contents # and the eol character(s). Gather up a list of lines after # re-attaching the newlines. |