Skip to content

Commit dbe007a

Browse files
author
Erik Forsberg
committed
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.
1 parent 2732538 commit dbe007a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

roundup/configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Roundup Issue Tracker configuration support
22
#
3-
# $Id: configuration.py,v 1.42 2007-04-03 06:36:08 a1s Exp $
3+
# $Id: configuration.py,v 1.43 2007-05-12 16:14:54 forsberg Exp $
44
#
55
__docformat__ = "restructuredtext"
66

@@ -685,7 +685,7 @@ def str2value(self, value):
685685
"will match an issue for the interval after the issue's\n"
686686
"creation or last activity. The interval is a standard\n"
687687
"Roundup interval."),
688-
(RegExpOption, "refwd_re", "\s*\W?\s*(fw|fwd|re|aw|sv|ang)\W\s*",
688+
(RegExpOption, "refwd_re", "(\s*\W?\s*(fw|fwd|re|aw|sv|ang)\W)+",
689689
"Regular expression matching a single reply or forward\n"
690690
"prefix prepended by the mailer. This is explicitly\n"
691691
"stripped from the subject during parsing."),

roundup/mailgw.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
7373
an exception, the original message is bounced back to the sender with the
7474
explanatory message given in the exception.
7575
76-
$Id: mailgw.py,v 1.187 2007-04-03 06:43:30 a1s Exp $
76+
$Id: mailgw.py,v 1.188 2007-05-12 16:14:54 forsberg Exp $
7777
"""
7878
__docformat__ = 'restructuredtext'
7979

@@ -636,7 +636,7 @@ def handle_message(self, message):
636636
'argswhole'])
637637

638638
# Look for Re: et. al. Used later on for MAILGW_SUBJECT_CONTENT_MATCH
639-
re_re = r"(?P<refwd>%s)*\s*" % config["MAILGW_REFWD_RE"].pattern
639+
re_re = r"(?P<refwd>%s)\s*" % config["MAILGW_REFWD_RE"].pattern
640640
m = re.match(re_re, tmpsubject, re.IGNORECASE|re.VERBOSE|re.UNICODE)
641641
if m:
642642
m = m.groupdict()

0 commit comments

Comments
 (0)