Mercurial > p > roundup > code
comparison roundup/mailgw.py @ 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 | 5bc54cb1d5d0 |
| children | 29759dfcfbcf |
comparison
equal
deleted
inserted
replaced
| 3853:d1eb694edcc7 | 3854:f4e8dc583256 |
|---|---|
| 71 set() method to add the message to the item's spool; in the second case we | 71 set() method to add the message to the item's spool; in the second case we |
| 72 are calling the create() method to create a new node). If an auditor raises | 72 are calling the create() method to create a new node). If an auditor raises |
| 73 an exception, the original message is bounced back to the sender with the | 73 an exception, the original message is bounced back to the sender with the |
| 74 explanatory message given in the exception. | 74 explanatory message given in the exception. |
| 75 | 75 |
| 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 $ |
| 77 """ | 77 """ |
| 78 __docformat__ = 'restructuredtext' | 78 __docformat__ = 'restructuredtext' |
| 79 | 79 |
| 80 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri | 80 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri |
| 81 import time, random, sys, logging | 81 import time, random, sys, logging |
| 634 matches = dict.fromkeys(['refwd', 'quote', 'classname', | 634 matches = dict.fromkeys(['refwd', 'quote', 'classname', |
| 635 'nodeid', 'title', 'args', | 635 'nodeid', 'title', 'args', |
| 636 'argswhole']) | 636 'argswhole']) |
| 637 | 637 |
| 638 # Look for Re: et. al. Used later on for MAILGW_SUBJECT_CONTENT_MATCH | 638 # 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 |
| 640 m = re.match(re_re, tmpsubject, re.IGNORECASE|re.VERBOSE|re.UNICODE) | 640 m = re.match(re_re, tmpsubject, re.IGNORECASE|re.VERBOSE|re.UNICODE) |
| 641 if m: | 641 if m: |
| 642 m = m.groupdict() | 642 m = m.groupdict() |
| 643 if m['refwd']: | 643 if m['refwd']: |
| 644 matches.update(m) | 644 matches.update(m) |