summaryrefslogtreecommitdiff
path: root/src/mailman/config/config.py
diff options
context:
space:
mode:
authorBarry Warsaw2016-11-30 20:57:31 +0000
committerBarry Warsaw2016-11-30 20:57:31 +0000
commit36a17d6ef058d61c9f866c66f3d9c74703fb72cc (patch)
tree4ac6f4060582744159e612b66b88b86e241a0d6e /src/mailman/config/config.py
parentcb498d3e960af6c741fac9896d8a60bab9f79865 (diff)
parent4a8b154e92acc76cdb437f2dc57543f67e1390a3 (diff)
downloadmailman-36a17d6ef058d61c9f866c66f3d9c74703fb72cc.tar.gz
mailman-36a17d6ef058d61c9f866c66f3d9c74703fb72cc.tar.zst
mailman-36a17d6ef058d61c9f866c66f3d9c74703fb72cc.zip
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
Diffstat (limited to 'src/mailman/config/config.py')
-rw-r--r--src/mailman/config/config.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index 5454c5e5a..a274aa3b9 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -24,13 +24,14 @@ import mailman.templates
from configparser import ConfigParser
from flufl.lock import Lock
from lazr.config import ConfigSchema, as_boolean
-from mailman import public, version
+from mailman import version
from mailman.interfaces.configuration import (
ConfigurationUpdatedEvent, IConfiguration, MissingConfigurationFileError)
from mailman.interfaces.languages import ILanguageManager
from mailman.utilities.filesystem import makedirs
from mailman.utilities.modules import call_name, expand_path
from pkg_resources import resource_filename, resource_string as resource_bytes
+from public import public
from string import Template
from zope.component import getUtility
from zope.event import notify