summaryrefslogtreecommitdiff
path: root/src/mailman/chains
diff options
context:
space:
mode:
authorBarry Warsaw2016-07-28 23:10:56 -0400
committerBarry Warsaw2016-07-28 23:10:56 -0400
commit90e84bee5f47cbcdb9e9c367c60a877e325ef3e7 (patch)
treebb7d2df3af049c6e84d65fd25cc0258b6af6ebb9 /src/mailman/chains
parent86b25ba2e3bac0e034235d322c7c77080d737833 (diff)
downloadmailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.tar.gz
mailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.tar.zst
mailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.zip
Diffstat (limited to 'src/mailman/chains')
-rw-r--r--src/mailman/chains/reject.py6
-rw-r--r--src/mailman/chains/tests/test_accept.py2
-rw-r--r--src/mailman/chains/tests/test_headers.py12
-rw-r--r--src/mailman/chains/tests/test_owner.py2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/mailman/chains/reject.py b/src/mailman/chains/reject.py
index 6711538b7..27fce8d4e 100644
--- a/src/mailman/chains/reject.py
+++ b/src/mailman/chains/reject.py
@@ -64,9 +64,9 @@ reasons:
The original message as received by Mailman is attached.
""").format(
- list_name=mlist.display_name, # noqa
- reasons=NEWLINE.join(reasons) # noqa
- )) # noqa
+ list_name=mlist.display_name, # noqa: E122
+ reasons=NEWLINE.join(reasons)
+ ))
bounce_message(mlist, msg, error)
log.info('REJECT: %s', msg.get('message-id', 'n/a'))
notify(RejectEvent(mlist, msg, msgdata, self))
diff --git a/src/mailman/chains/tests/test_accept.py b/src/mailman/chains/tests/test_accept.py
index 9b7a25fab..07ed958b0 100644
--- a/src/mailman/chains/tests/test_accept.py
+++ b/src/mailman/chains/tests/test_accept.py
@@ -60,7 +60,7 @@ Subject: Ignore
config.chains['mine'] = MyChain()
self.addCleanup(config.chains.pop, 'mine')
hits = None
- def handler(event): # noqa
+ def handler(event): # noqa: E301
nonlocal hits
if isinstance(event, AcceptEvent):
hits = event.msg['x-mailman-rule-hits']
diff --git a/src/mailman/chains/tests/test_headers.py b/src/mailman/chains/tests/test_headers.py
index 6cd37c988..e21fa452d 100644
--- a/src/mailman/chains/tests/test_headers.py
+++ b/src/mailman/chains/tests/test_headers.py
@@ -167,7 +167,7 @@ class TestHeaderChain(unittest.TestCase):
[('foo', 'a+', LinkAction.jump, 'reject'),
('bar', 'b+', LinkAction.jump, 'discard'),
('baz', 'z+', LinkAction.jump, 'accept'),
- ]) # noqa
+ ]) # noqa: E124
@configuration('antispam', header_checks="""
Foo: foo
@@ -217,7 +217,7 @@ A message body.
# This event subscriber records the event that occurs when the message
# is processed by the owner chain, which holds its for approval.
events = []
- def record_holds(event): # noqa
+ def record_holds(event): # noqa: E301
if not isinstance(event, HoldEvent):
return
events.append(event)
@@ -225,7 +225,7 @@ A message body.
# Set the site-wide antispam action to hold the message.
with configuration('antispam', header_checks="""
Spam: [*]{3,}
- """, jump_chain='hold'): # noqa
+ """, jump_chain='hold'): # noqa: E125
process(self._mlist, msg, {}, start_chain='header-match')
self.assertEqual(len(events), 1)
event = events[0]
@@ -234,7 +234,7 @@ A message body.
self.assertEqual(event.mlist, self._mlist)
self.assertEqual(event.msg, msg)
events = []
- def record_discards(event): # noqa
+ def record_discards(event): # noqa: E301
if not isinstance(event, DiscardEvent):
return
events.append(event)
@@ -243,7 +243,7 @@ A message body.
msg.replace_header('Message-Id', '<bee>')
with configuration('antispam', header_checks="""
Spam: [*]{3,}
- """, jump_chain='discard'): # noqa
+ """, jump_chain='discard'): # noqa: E125
process(self._mlist, msg, {}, start_chain='header-match')
self.assertEqual(len(events), 1)
event = events[0]
@@ -262,7 +262,7 @@ A message body.
header_matches = IHeaderMatchList(self._mlist)
header_matches.append('Header2', 'b+')
header_matches.append('Header3', 'c+')
- def get_links(): # noqa
+ def get_links(): # noqa: E301
return [
link for link in chain.get_links(self._mlist, Message(), {})
if link.rule.name != 'any'
diff --git a/src/mailman/chains/tests/test_owner.py b/src/mailman/chains/tests/test_owner.py
index 004c0200a..70328303b 100644
--- a/src/mailman/chains/tests/test_owner.py
+++ b/src/mailman/chains/tests/test_owner.py
@@ -50,7 +50,7 @@ Message-ID: <ant>
# This event subscriber records the event that occurs when the message
# is processed by the owner chain.
events = []
- def catch_event(event): # noqa
+ def catch_event(event): # noqa: E301
if isinstance(event, AcceptOwnerEvent):
events.append(event)
with event_subscribers(catch_event):