summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBarry Warsaw2016-11-26 05:13:49 +0000
committerBarry Warsaw2016-11-26 05:13:49 +0000
commit88212f9d5c9a13e8e723d90a42f00d0f9b66d929 (patch)
tree853353fb18d609e73a45e843784e6475afe372a4 /src
parent86162ef47bbf9ab71faceed9eaa656ebb8e1ec63 (diff)
parent36d114b37755ef96c4b0215feabe5095237c15e2 (diff)
downloadmailman-88212f9d5c9a13e8e723d90a42f00d0f9b66d929.tar.gz
mailman-88212f9d5c9a13e8e723d90a42f00d0f9b66d929.tar.zst
mailman-88212f9d5c9a13e8e723d90a42f00d0f9b66d929.zip
Diffstat (limited to 'src')
-rw-r--r--src/mailman/utilities/importer.py2
-rw-r--r--src/mailman/utilities/tests/test_import.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index 00c30c9f0..cf14fa73a 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -336,7 +336,7 @@ def import_config_pck(mlist, config_dict):
for line_pattern in line_patterns.splitlines():
if len(line_pattern.strip()) == 0:
continue
- for sep in (': ', ':.', ':'):
+ for sep in (': ', ':.*', ':.', ':'):
header, sep, pattern = line_pattern.partition(sep)
if sep:
# We found it.
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index ca3a4afb7..d74a198df 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -336,6 +336,7 @@ class TestBasicImport(unittest.TestCase):
('^Subject: dev-\r\n^Subject: staging-', 3, False),
('from: .*info@aolanchem.com\r\nfrom: .*@jw-express.com',
2, False),
+ ('^Subject:.*\\Wwas:\\W', 3, False),
('^Received: from smtp-.*\\.fedoraproject\\.org\r\n'
'^Received: from mx.*\\.redhat.com\r\n'
'^Resent-date:\r\n'
@@ -372,6 +373,7 @@ class TestBasicImport(unittest.TestCase):
('subject', 'staging-', 'discard'),
('from', '.*info@aolanchem.com', 'reject'),
('from', '.*@jw-express.com', 'reject'),
+ ('subject', '\\Wwas:\\W', 'discard'),
('received', 'from smtp-.*\\.fedoraproject\\.org', 'hold'),
('received', 'from mx.*\\.redhat.com', 'hold'),
('resent-date', '.*', 'hold'),