summaryrefslogtreecommitdiff
path: root/src/mailman/utilities/tests
diff options
context:
space:
mode:
authorBarry Warsaw2016-11-21 14:08:02 +0000
committerBarry Warsaw2016-11-21 14:08:02 +0000
commit28ee840bbb4ef616fa2655452534a1f1ba687b00 (patch)
treeeb4da32bbfb874f999736d8bf678870e08459818 /src/mailman/utilities/tests
parent54d32b872ee4e67a64a176077dbc49a4f87b9324 (diff)
parent0a5efbdf15a67f6e4065c78b0c70e72202e0d965 (diff)
downloadmailman-28ee840bbb4ef616fa2655452534a1f1ba687b00.tar.gz
mailman-28ee840bbb4ef616fa2655452534a1f1ba687b00.tar.zst
mailman-28ee840bbb4ef616fa2655452534a1f1ba687b00.zip
Merge branch 'flake8-errors' into 'master'
Ignore some Flake8 errors Flake8 implicitely ignores some errors, and new versions tend to add new errors. This change explicitely lists the errors we want to ignore. See merge request !218
Diffstat (limited to 'src/mailman/utilities/tests')
-rw-r--r--src/mailman/utilities/tests/test_templates.py10
-rw-r--r--src/mailman/utilities/tests/test_uid.py2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mailman/utilities/tests/test_templates.py b/src/mailman/utilities/tests/test_templates.py
index a2b364c1a..02c77d0fa 100644
--- a/src/mailman/utilities/tests/test_templates.py
+++ b/src/mailman/utilities/tests/test_templates.py
@@ -77,7 +77,7 @@ class TestSearchOrder(unittest.TestCase):
def test_fully_specified_search_order(self):
search_order = self._stripped_search_order('foo.txt', self.mlist, 'it')
# For convenience.
- def nexteq(path): # noqa: E301
+ def nexteq(path): # noqa: E306
self.assertEqual(next(search_order), path)
# 1: Use the given language argument
nexteq('/v/templates/lists/l.example.com/it/foo.txt')
@@ -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): # noqa: E301
+ def nexteq(path): # noqa: E306
self.assertEqual(next(search_order), path)
# 1: Use mlist.preferred_language
nexteq('/v/templates/lists/l.example.com/de/foo.txt')
@@ -132,7 +132,7 @@ class TestSearchOrder(unittest.TestCase):
def test_no_mailing_list_argument_search_order(self):
search_order = self._stripped_search_order('foo.txt', language='it')
# For convenience.
- def nexteq(path): # noqa: E301
+ def nexteq(path): # noqa: E306
self.assertEqual(next(search_order), path)
# 1: Use the given language argument
nexteq('/v/templates/site/it/foo.txt')
@@ -148,7 +148,7 @@ class TestSearchOrder(unittest.TestCase):
def test_no_optional_arguments_search_order(self):
search_order = self._stripped_search_order('foo.txt')
# For convenience.
- def nexteq(path): # noqa: E301
+ def nexteq(path): # noqa: E306
self.assertEqual(next(search_order), path)
# 1: Use the site's default language
nexteq('/v/templates/site/fr/foo.txt')
@@ -180,7 +180,7 @@ class TestFind(unittest.TestCase):
self.mlist.preferred_language = 'xx'
self.fp = None
# Populate the template directories with a few fake templates.
- def write(text, path): # noqa: E301
+ def write(text, path): # noqa: E306
os.makedirs(os.path.dirname(path))
with open(path, 'w') as fp:
fp.write(text)
diff --git a/src/mailman/utilities/tests/test_uid.py b/src/mailman/utilities/tests/test_uid.py
index fd00ddfff..e3476dfbc 100644
--- a/src/mailman/utilities/tests/test_uid.py
+++ b/src/mailman/utilities/tests/test_uid.py
@@ -54,7 +54,7 @@ class TestUID(unittest.TestCase):
def test_uid_record_try_again(self):
called = False
- def record_second(ignore): # noqa: E301
+ def record_second(ignore): # noqa: E306
nonlocal called
if not called:
called = True