From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
I forgot to update all cases - I updated __parse_mail, not __parse_patch, so
refactor together this duplication and use the fixed version.
Btw, I don't like those regexps - they'd match in the middle of line too. What
about adding ^ to their beginning like for the "^Index: " regexp?
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
help = 'use COMMEMAIL as the committer e-mail')]
help = 'use COMMEMAIL as the committer e-mail')]
+def __end_descr(line):
+ return re.match('---\s*$', line) or re.match('diff -', line) or \
+ re.match('Index: ', line)
+
def __parse_mail(filename = None):
"""Parse the input file in a mail format and return (description,
authname, authemail, authdate)
def __parse_mail(filename = None):
"""Parse the input file in a mail format and return (description,
authname, authemail, authdate)
line = f.readline()
if not line:
break
line = f.readline()
if not line:
break
- if re.match('---\s*$', line) or re.match('diff -', line) or \
- re.match('^Index: ', line):
break
else:
descr += line
break
else:
descr += line
auth = re.findall('^.*?:\s+(.*)$', line)[0]
authname, authemail = name_email(auth)
auth = re.findall('^.*?:\s+(.*)$', line)[0]
authname, authemail = name_email(auth)
- if re.match('---\s*$', line) or re.match('diff -', line):
break
else:
descr += line
break
else:
descr += line