Mercurial > p > roundup > code
changeset 3854:f4e8dc583256
Restored subject parser regexp to the string it was before the...
...implementation of customization of it, i.e., the version from
CVS revision 1.184 of mailgw.py.
This makes 'testFollowupTitleMatchMultiRe' work again.
| author | Erik Forsberg <forsberg@users.sourceforge.net> |
|---|---|
| date | Sat, 12 May 2007 16:14:54 +0000 |
| parents | d1eb694edcc7 |
| children | de4c2e538e06 |
| files | roundup/configuration.py roundup/mailgw.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/configuration.py Wed May 09 06:18:52 2007 +0000 +++ b/roundup/configuration.py Sat May 12 16:14:54 2007 +0000 @@ -1,6 +1,6 @@ # Roundup Issue Tracker configuration support # -# $Id: configuration.py,v 1.42 2007-04-03 06:36:08 a1s Exp $ +# $Id: configuration.py,v 1.43 2007-05-12 16:14:54 forsberg Exp $ # __docformat__ = "restructuredtext" @@ -685,7 +685,7 @@ "will match an issue for the interval after the issue's\n" "creation or last activity. The interval is a standard\n" "Roundup interval."), - (RegExpOption, "refwd_re", "\s*\W?\s*(fw|fwd|re|aw|sv|ang)\W\s*", + (RegExpOption, "refwd_re", "(\s*\W?\s*(fw|fwd|re|aw|sv|ang)\W)+", "Regular expression matching a single reply or forward\n" "prefix prepended by the mailer. This is explicitly\n" "stripped from the subject during parsing."),
--- a/roundup/mailgw.py Wed May 09 06:18:52 2007 +0000 +++ b/roundup/mailgw.py Sat May 12 16:14:54 2007 +0000 @@ -73,7 +73,7 @@ an exception, the original message is bounced back to the sender with the explanatory message given in the exception. -$Id: mailgw.py,v 1.187 2007-04-03 06:43:30 a1s Exp $ +$Id: mailgw.py,v 1.188 2007-05-12 16:14:54 forsberg Exp $ """ __docformat__ = 'restructuredtext' @@ -636,7 +636,7 @@ 'argswhole']) # Look for Re: et. al. Used later on for MAILGW_SUBJECT_CONTENT_MATCH - re_re = r"(?P<refwd>%s)*\s*" % config["MAILGW_REFWD_RE"].pattern + re_re = r"(?P<refwd>%s)\s*" % config["MAILGW_REFWD_RE"].pattern m = re.match(re_re, tmpsubject, re.IGNORECASE|re.VERBOSE|re.UNICODE) if m: m = m.groupdict()