summaryrefslogtreecommitdiff
path: root/src/mailman/utilities/importer.py
diff options
context:
space:
mode:
authorAurélien Bompard2015-09-11 14:31:41 +0200
committerBarry Warsaw2015-10-20 21:10:34 -0400
commited772e4fe2296460f0261a114b4f4eea3b318d6a (patch)
treee78a664f584f4bca025ee5e4e16b6efceb0b3687 /src/mailman/utilities/importer.py
parent583a7639eb78dc52cf899076fef777e303101567 (diff)
downloadmailman-ed772e4fe2296460f0261a114b4f4eea3b318d6a.tar.gz
mailman-ed772e4fe2296460f0261a114b4f4eea3b318d6a.tar.zst
mailman-ed772e4fe2296460f0261a114b4f4eea3b318d6a.zip
Diffstat (limited to 'src/mailman/utilities/importer.py')
-rw-r--r--src/mailman/utilities/importer.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index df0557c08..1261823fd 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -48,6 +48,7 @@ from mailman.interfaces.mailinglist import SubscriptionPolicy
from mailman.interfaces.member import DeliveryMode, DeliveryStatus, MemberRole
from mailman.interfaces.nntp import NewsgroupModeration
from mailman.interfaces.usermanager import IUserManager
+from mailman.model.mailinglist import HeaderMatch
from mailman.utilities.filesystem import makedirs
from mailman.utilities.i18n import search
from sqlalchemy import Boolean
@@ -334,7 +335,6 @@ def import_config_pck(mlist, config_dict):
# expression. Make that explicit for MM3.
alias_set.add('^' + address)
# Handle header_filter_rules conversion to header_matches
- header_matches = []
for line_patterns, action, _unused in \
config_dict.get('header_filter_rules', []):
chain = action_to_chain(action)
@@ -367,8 +367,8 @@ def import_config_pck(mlist, config_dict):
log.warning('Skipping header_filter rule because of an '
'invalid regular expression: %r', line_pattern)
continue
- header_matches.append((header, pattern, chain))
- mlist.header_matches = header_matches
+ mlist.header_matches.append(HeaderMatch(
+ header=header, pattern=pattern, chain=chain))
# Handle conversion to URIs. In MM2.1, the decorations are strings
# containing placeholders, and there's no provision for language-specific
# templates. In MM3, template locations are specified by URLs with the