Merge branch 'fluflpublic' into 'master'

Pay off some tech debt

This cleans up a few things.

* Use `flufl.testing`'s flake8 and nose2 plugins instead of Mailman's copies.
* Use `atpublic`'s `@public` decorator instead of Mailman's copies.

See merge request !221

15 files changed, 17 insertions, 16 deletions

diff --git a/src/mailman/utilities/datetime.py b/src/mailman/utilities/datetime.py
index 9bb772b3f..2915080e8 100644
--- a/src/mailman/utilities/datetime.py
+++ b/src/mailman/utilities/datetime.py
@@ -24,8 +24,8 @@ instrumented for testing purposes.
 
 import datetime
 
-from mailman import public
 from mailman.testing import layers
+from public import public
 
 
 # Python always sets the locale to 'C' locale unless the user explicitly calls
diff --git a/src/mailman/utilities/email.py b/src/mailman/utilities/email.py
index e870117ac..546a7de61 100644
--- a/src/mailman/utilities/email.py
+++ b/src/mailman/utilities/email.py
@@ -19,7 +19,7 @@
 
 from base64 import b32encode
 from hashlib import sha1
-from mailman import public
+from public import public
 
 
 @public
diff --git a/src/mailman/utilities/filesystem.py b/src/mailman/utilities/filesystem.py
index e89f2abb8..7dcf2bb80 100644
--- a/src/mailman/utilities/filesystem.py
+++ b/src/mailman/utilities/filesystem.py
@@ -20,7 +20,7 @@
 import os
 
 from contextlib import suppress
-from mailman import public
+from public import public
 
 
 @public
diff --git a/src/mailman/utilities/i18n.py b/src/mailman/utilities/i18n.py
index 1df8ede7e..a658c231b 100644
--- a/src/mailman/utilities/i18n.py
+++ b/src/mailman/utilities/i18n.py
@@ -21,11 +21,11 @@ import os
 import sys
 
 from itertools import product
-from mailman import public
 from mailman.config import config
 from mailman.core.constants import system_preferences
 from mailman.interfaces.errors import MailmanError
 from pkg_resources import resource_filename
+from public import public
 
 
 @public
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index cf14fa73a..c8348a681 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -23,7 +23,6 @@ import sys
 import logging
 import datetime
 
-from mailman import public
 from mailman.config import config
 from mailman.handlers.decorate import decorate_template
 from mailman.interfaces.action import Action, FilterAction
@@ -44,6 +43,7 @@ from mailman.interfaces.template import ITemplateManager
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.i18n import search
+from public import public
 from sqlalchemy import Boolean
 from zope.component import getUtility
 
diff --git a/src/mailman/utilities/interact.py b/src/mailman/utilities/interact.py
index ac1612156..48f3ae358 100644
--- a/src/mailman/utilities/interact.py
+++ b/src/mailman/utilities/interact.py
@@ -23,7 +23,7 @@ import code
 
 from contextlib import suppress
 from inspect import signature
-from mailman import public
+from public import public
 
 
 DEFAULT_BANNER = object()
diff --git a/src/mailman/utilities/mailbox.py b/src/mailman/utilities/mailbox.py
index b799babea..19146e036 100644
--- a/src/mailman/utilities/mailbox.py
+++ b/src/mailman/utilities/mailbox.py
@@ -23,8 +23,9 @@
 # get its size.  MMDF is slightly more sane than mbox; it's primary advantage
 # for us is that it does no 'From' mangling.
 # mangling.
+
 from mailbox import MMDF
-from mailman import public
+from public import public
 
 
 @public
diff --git a/src/mailman/utilities/modules.py b/src/mailman/utilities/modules.py
index b16aa45e5..83063a3f0 100644
--- a/src/mailman/utilities/modules.py
+++ b/src/mailman/utilities/modules.py
@@ -20,8 +20,8 @@
 import os
 import sys
 
-from mailman import public
 from pkg_resources import resource_filename, resource_listdir
+from public import public
 
 
 @public
diff --git a/src/mailman/utilities/options.py b/src/mailman/utilities/options.py
index 1c0064260..9e1e698a7 100644
--- a/src/mailman/utilities/options.py
+++ b/src/mailman/utilities/options.py
@@ -21,12 +21,12 @@ import os
 import sys
 
 from copy import copy
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.core.initialize import initialize
 from mailman.version import MAILMAN_VERSION
 from optparse import Option, OptionParser, OptionValueError
+from public import public
 
 
 def check_unicode(option, opt, value):
diff --git a/src/mailman/utilities/passwords.py b/src/mailman/utilities/passwords.py
index 5597e2556..7bf18b93a 100644
--- a/src/mailman/utilities/passwords.py
+++ b/src/mailman/utilities/passwords.py
@@ -17,10 +17,10 @@
 
 """A wrapper around passlib."""
 
-from mailman import public
 from mailman.config.config import load_external
 from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 from passlib.context import CryptContext
+from public import public
 
 
 class PasswordContext:
diff --git a/src/mailman/utilities/protocols.py b/src/mailman/utilities/protocols.py
index 5f447c465..43d43a8bc 100644
--- a/src/mailman/utilities/protocols.py
+++ b/src/mailman/utilities/protocols.py
@@ -19,10 +19,10 @@
 
 import requests
 
-from mailman import public
 from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.listmanager import IListManager
 from mailman.utilities.i18n import TemplateNotFoundError, find
+from public import public
 from urllib.error import URLError
 from urllib.parse import urlparse
 from zope.component import getUtility
diff --git a/src/mailman/utilities/queries.py b/src/mailman/utilities/queries.py
index e27ae9a17..cd6542270 100644
--- a/src/mailman/utilities/queries.py
+++ b/src/mailman/utilities/queries.py
@@ -18,7 +18,7 @@
 """Some helpers for queries."""
 
 from collections.abc import Sequence
-from mailman import public
+from public import public
 
 
 @public
diff --git a/src/mailman/utilities/string.py b/src/mailman/utilities/string.py
index 2694877ee..fecadc444 100644
--- a/src/mailman/utilities/string.py
+++ b/src/mailman/utilities/string.py
@@ -21,8 +21,8 @@ import logging
 
 from email.errors import HeaderParseError
 from email.header import decode_header, make_header
-from mailman import public
 from mailman.config import config
+from public import public
 from string import Template, whitespace
 from textwrap import TextWrapper, dedent
 
diff --git a/src/mailman/utilities/tests/test_modules.py b/src/mailman/utilities/tests/test_modules.py
index 8e144e60b..d34a99910 100644
--- a/src/mailman/utilities/tests/test_modules.py
+++ b/src/mailman/utilities/tests/test_modules.py
@@ -67,7 +67,7 @@ class TestModuleImports(unittest.TestCase):
             Path(init_file).touch()
             with open(good_file, 'w', encoding='utf-8') as fp:
                 print("""\
-from mailman import public
+from public import public
 from mailman.interfaces.styles import IStyle
 from zope.interface import implementer
 
@@ -80,7 +80,7 @@ class GoodStyle:
 """, file=fp)
             with open(bad_file, 'w', encoding='utf-8') as fp:
                 print("""\
-from mailman import public
+from public import public
 from mailman.interfaces.styles import IStyle
 from zope.interface import implementer
 
diff --git a/src/mailman/utilities/uid.py b/src/mailman/utilities/uid.py
index 4389bcd92..9abf92e90 100644
--- a/src/mailman/utilities/uid.py
+++ b/src/mailman/utilities/uid.py
@@ -29,10 +29,10 @@ import hashlib
 
 from contextlib import suppress
 from flufl.lock import Lock
-from mailman import public
 from mailman.config import config
 from mailman.model.uid import UID
 from mailman.testing import layers
+from public import public
 
 
 class _PredictableIDGenerator: