summaryrefslogtreecommitdiff
path: root/src/mailman/handlers/subject_prefix.py
diff options
context:
space:
mode:
authorBarry Warsaw2016-04-30 13:34:04 -0400
committerGitLab2016-04-30 19:54:54 +0000
commitc6eb7ee3e574b48ee016dd31af2014b0ed083268 (patch)
tree14c1f1e7bb382898ee50909333365aab335aa4a1 /src/mailman/handlers/subject_prefix.py
parent465f24ff33e154385322ee894d32d8b7dd9b3941 (diff)
downloadmailman-c6eb7ee3e574b48ee016dd31af2014b0ed083268.tar.gz
mailman-c6eb7ee3e574b48ee016dd31af2014b0ed083268.tar.zst
mailman-c6eb7ee3e574b48ee016dd31af2014b0ed083268.zip
Diffstat (limited to 'src/mailman/handlers/subject_prefix.py')
-rw-r--r--src/mailman/handlers/subject_prefix.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mailman/handlers/subject_prefix.py b/src/mailman/handlers/subject_prefix.py
index 8a9da8b42..ff728d92e 100644
--- a/src/mailman/handlers/subject_prefix.py
+++ b/src/mailman/handlers/subject_prefix.py
@@ -19,7 +19,8 @@
import re
-from email.header import Header, make_header, decode_header
+from contextlib import suppress
+from email.header import Header, decode_header, make_header
from mailman import public
from mailman.core.i18n import _
from mailman.interfaces.handler import IHandler
@@ -163,10 +164,8 @@ class SubjectPrefix:
# subject. Also, force new style.
prefix_pattern = p.sub(r'\s*\d+\s*', prefix_pattern)
# Substitute %d in prefix with post_id
- try:
+ with suppress(TypeError):
prefix = prefix % mlist.post_id
- except TypeError:
- pass
for handler in (ascii_header,
all_same_charset,
mixed_charsets,