diff options
| author | Barry Warsaw | 2016-07-28 23:10:56 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2016-07-28 23:10:56 -0400 |
| commit | 90e84bee5f47cbcdb9e9c367c60a877e325ef3e7 (patch) | |
| tree | bb7d2df3af049c6e84d65fd25cc0258b6af6ebb9 /src/mailman/app | |
| parent | 86b25ba2e3bac0e034235d322c7c77080d737833 (diff) | |
| download | mailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.tar.gz mailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.tar.zst mailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.zip | |
Rebase mailman/mailman!180 and cleanup # noqa
Diffstat (limited to 'src/mailman/app')
| -rw-r--r-- | src/mailman/app/moderator.py | 2 | ||||
| -rw-r--r-- | src/mailman/app/notifications.py | 2 | ||||
| -rw-r--r-- | src/mailman/app/subscriptions.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mailman/app/moderator.py b/src/mailman/app/moderator.py index 8ce631941..c3347c1ff 100644 --- a/src/mailman/app/moderator.py +++ b/src/mailman/app/moderator.py @@ -243,7 +243,7 @@ def send_rejection(mlist, request, recip, comment, origmsg=None, lang=None): # As this message is going to the requester, try to set the language to # his/her language choice, if they are a member. Otherwise use the list's # preferred language. - display_name = mlist.display_name # noqa + display_name = mlist.display_name # noqa: F841 if lang is None: member = mlist.members.get_member(recip) lang = (mlist.preferred_language diff --git a/src/mailman/app/notifications.py b/src/mailman/app/notifications.py index 11a21a379..31a15d820 100644 --- a/src/mailman/app/notifications.py +++ b/src/mailman/app/notifications.py @@ -61,7 +61,7 @@ def send_welcome_message(mlist, member, language, text=''): list_name=mlist.display_name, list_requests=mlist.request_address, )) - digmode = ('' # noqa + digmode = ('' # noqa: F841 if member.delivery_mode is DeliveryMode.regular else _(' (Digest mode)')) msg = UserNotification( diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py index 3042623d1..a397c4fde 100644 --- a/src/mailman/app/subscriptions.py +++ b/src/mailman/app/subscriptions.py @@ -224,7 +224,7 @@ class SubscriptionWorkflow(Workflow): next_step = ( 'moderation_checks' if self.mlist.subscription_policy is - SubscriptionPolicy.confirm_then_moderate # noqa + SubscriptionPolicy.confirm_then_moderate # noqa: E131 else 'do_subscription') self.push(next_step) return |