diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/app/subscriptions.py | 2 | ||||
| -rw-r--r-- | src/mailman/chains/tests/test_headers.py | 2 | ||||
| -rw-r--r-- | src/mailman/commands/cli_lists.py | 10 | ||||
| -rw-r--r-- | src/mailman/database/tests/test_migrations.py | 4 | ||||
| -rw-r--r-- | src/mailman/handlers/cook_headers.py | 4 | ||||
| -rw-r--r-- | src/mailman/mta/deliver.py | 4 | ||||
| -rw-r--r-- | src/mailman/utilities/tests/test_templates.py | 2 |
7 files changed, 13 insertions, 15 deletions
diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py index d72002b49..e360d9615 100644 --- a/src/mailman/app/subscriptions.py +++ b/src/mailman/app/subscriptions.py @@ -20,9 +20,9 @@ import uuid import logging +from datetime import timedelta from email.utils import formataddr from enum import Enum -from datetime import timedelta from mailman import public from mailman.app.workflow import Workflow from mailman.core.i18n import _ diff --git a/src/mailman/chains/tests/test_headers.py b/src/mailman/chains/tests/test_headers.py index 246462d5f..9c3cc1b40 100644 --- a/src/mailman/chains/tests/test_headers.py +++ b/src/mailman/chains/tests/test_headers.py @@ -24,7 +24,7 @@ from mailman.chains.headers import HeaderMatchRule, make_link from mailman.config import config from mailman.core.chains import process from mailman.email.message import Message -from mailman.interfaces.chain import LinkAction, HoldEvent, DiscardEvent +from mailman.interfaces.chain import DiscardEvent, HoldEvent, LinkAction from mailman.interfaces.mailinglist import IHeaderMatchList from mailman.testing.helpers import ( LogFileMark, configuration, event_subscribers, diff --git a/src/mailman/commands/cli_lists.py b/src/mailman/commands/cli_lists.py index 0b077543e..352accab2 100644 --- a/src/mailman/commands/cli_lists.py +++ b/src/mailman/commands/cli_lists.py @@ -222,11 +222,11 @@ class Create: print(_('Created mailing list: $mlist.fqdn_listname')) if args.notify: d = dict( - listname = mlist.fqdn_listname, - admin_url = mlist.script_url('admin'), - listinfo_url = mlist.script_url('listinfo'), - requestaddr = mlist.request_address, - siteowner = mlist.no_reply_address, + listname = mlist.fqdn_listname, # noqa + admin_url = mlist.script_url('admin'), # noqa + listinfo_url = mlist.script_url('listinfo'), # noqa + requestaddr = mlist.request_address, # noqa + siteowner = mlist.no_reply_address, # noqa ) text = make('newlist.txt', mailing_list=mlist, **d) # Set the I18N language to the list's preferred language so the diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py index e1ab3f90f..1994c3854 100644 --- a/src/mailman/database/tests/test_migrations.py +++ b/src/mailman/database/tests/test_migrations.py @@ -128,9 +128,7 @@ class TestMigrations(unittest.TestCase): sa.sql.column('value', sa.Unicode), sa.sql.column('pended_id', sa.Integer), ) - - # https://github.com/PyCQA/pycodestyle/issues/28 - def get_from_db(): # noqa + def get_from_db(): # noqa results = {} for i in range(1, 6): query = sa.sql.select( diff --git a/src/mailman/handlers/cook_headers.py b/src/mailman/handlers/cook_headers.py index 5b015b51c..23a65cdcd 100644 --- a/src/mailman/handlers/cook_headers.py +++ b/src/mailman/handlers/cook_headers.py @@ -20,7 +20,7 @@ import re from email.header import Header -from email.utils import parseaddr, formataddr, getaddresses +from email.utils import formataddr, getaddresses, parseaddr from mailman import public from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler @@ -139,7 +139,7 @@ def process(mlist, msg, msgdata): # is already in From and Reply-To in this case. if (mlist.personalize is Personalization.full and mlist.reply_goes_to_list is not - ReplyToMunging.point_to_list and + ReplyToMunging.point_to_list and # noqa not mlist.anonymous_list): # Watch out for existing Cc headers, merge, and remove dups. Note # that RFC 2822 says only zero or one Cc header is allowed. diff --git a/src/mailman/mta/deliver.py b/src/mailman/mta/deliver.py index d1f87db07..6ca743df4 100644 --- a/src/mailman/mta/deliver.py +++ b/src/mailman/mta/deliver.py @@ -24,11 +24,11 @@ from mailman import public from mailman.config import config from mailman.interfaces.mailinglist import Personalization from mailman.interfaces.mta import SomeRecipientsFailed +from mailman.mta.base import IndividualDelivery +from mailman.mta.bulk import BulkDelivery from mailman.mta.decorating import DecoratingMixin from mailman.mta.personalized import PersonalizedMixin from mailman.mta.verp import VERPMixin -from mailman.mta.base import IndividualDelivery -from mailman.mta.bulk import BulkDelivery from mailman.utilities.string import expand diff --git a/src/mailman/utilities/tests/test_templates.py b/src/mailman/utilities/tests/test_templates.py index c2f7dd59a..fcb0ecc1c 100644 --- a/src/mailman/utilities/tests/test_templates.py +++ b/src/mailman/utilities/tests/test_templates.py @@ -107,7 +107,7 @@ class TestSearchOrder(unittest.TestCase): def test_no_language_argument_search_order(self): search_order = self._stripped_search_order('foo.txt', self.mlist) # For convenience. - def nexteq(path): # flakeq: noqa + def nexteq(path): # noqa self.assertEqual(next(search_order), path) # 1: Use mlist.preferred_language nexteq('/v/templates/lists/l.example.com/de/foo.txt') |