On 06 Jan 17:10, Finucane, Stephen wrote: > On 28 Nov 10:14, Mauro Carvalho Chehab wrote: > > From: Laurent Pinchart <[email protected]> > > > > Signed-off-by: Laurent Pinchart <[email protected]> > > Signed-off-by: Mauro Carvalho Chehab <[email protected]> > > --- > > patchwork/bin/parsemail.py | 47 > > +++++++++++++++++++++++++++++++++++++++------- > > 1 file changed, 40 insertions(+), 7 deletions(-) > > > > diff --git a/patchwork/bin/parsemail.py b/patchwork/bin/parsemail.py > > index e66b55715d8f..4f22c7f2d6a0 100755 > > --- a/patchwork/bin/parsemail.py > > +++ b/patchwork/bin/parsemail.py > > @@ -25,13 +25,14 @@ import datetime > > import time > > import operator > > import codecs > > +from fnmatch import fnmatch > > from email import message_from_file > > from email.header import Header, decode_header > > from email.utils import parsedate_tz, mktime_tz > > > > -from patchwork.parser import parse_patch > > +from patchwork.parser import parse_patch, patch_get_filenames > > from patchwork.models import Patch, Project, Person, Comment, State, \ > > - get_default_initial_patch_state > > + DelegationRule, get_default_initial_patch_state > > import django > > from django.contrib.auth.models import User > > > > @@ -208,6 +209,10 @@ def find_content(project, mail): > > > > patch = None > > comment = None > > + filenames = None > > + > > + if patchbuf: > > + filenames = patch_get_filenames(patchbuf) > > > > if pullurl or patchbuf: > > name = clean_subject(mail.get('Subject'), [project.linkname]) > > @@ -225,12 +230,12 @@ def find_content(project, mail): > > else: > > cpatch = find_patch_for_comment(project, mail) > > if not cpatch: > > - return (None, None) > > + return (None, None, None) > > So this changes the signature for the function, resulting in a lot of > failing unit tests. Could you fix these? You can run them like so: > > tox > > or to test a specific environment: > > tox -e py27-django18 > > Alternatively I can fix them, though I'm not sure if I should resend > the entire series or not? > > Stephen
I fixed these. Merged. _______________________________________________ Patchwork mailing list [email protected] https://lists.ozlabs.org/listinfo/patchwork
