[PATCH] parser: Fix parsing of pull request emails with CRLF line endings on Python 2
stephen at that.guru
Wed Jan 10 10:56:24 AEDT 2018
On Tue, 2018-01-09 at 12:01 +1100, Andrew Donnellan wrote:
> On 09/01/18 11:56, Daniel Axtens wrote:
> > > diff --git a/patchwork/parser.py b/patchwork/parser.py
> > > index 1568bc4..7c677db 100644
> > > --- a/patchwork/parser.py
> > > +++ b/patchwork/parser.py
> > > @@ -666,9 +666,13 @@ def clean_content(content):
> > > """Remove cruft from the email message.
> > >
> > > Catch signature (-- ) and list footer (_____) cruft.
> > > +
> > > + Change to Unix line endings (the Python 3 email module does
> > > this for us,
> > > + but not Python 2).
> > > """
> > > sig_re = re.compile(r'^(-- |_+)\n.*', re.S | re.M)
> > > content = sig_re.sub('', content)
> > > + content = content.replace('\r\n', '\n')
> > Shouldn't this go before the removal of signatures?
> Good point
Pending this change, this looks good to me. I'll leave the actual
applying to Daniel though, in case he has more comments.
Reviewed-by: Stephen Finucane <stephen at that.guru>
PS: I guess we can just use unix2dos on the test patch. Might we worth
extending the test to make sure the file always has DOS line endings
More information about the Patchwork