diff options
Diffstat (limited to 'src/mailman/config')
| -rw-r--r-- | src/mailman/config/__init__.py | 2 | ||||
| -rw-r--r-- | src/mailman/config/config.py | 3 | ||||
| -rw-r--r-- | src/mailman/config/passlib.cfg | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mailman/config/__init__.py b/src/mailman/config/__init__.py index 5c45d6599..66b298217 100644 --- a/src/mailman/config/__init__.py +++ b/src/mailman/config/__init__.py @@ -17,8 +17,8 @@ """Mailman configuration package.""" -from mailman import public from mailman.config.config import Configuration +from public import public public(config=Configuration()) 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 diff --git a/src/mailman/config/passlib.cfg b/src/mailman/config/passlib.cfg index 805f0fb11..0564f9eb3 100644 --- a/src/mailman/config/passlib.cfg +++ b/src/mailman/config/passlib.cfg @@ -3,7 +3,6 @@ # See http://packages.python.org/passlib/index.html for details. schemes = sha512_crypt, sha256_crypt default = sha512_crypt -all__vary_rounds = 0.1 sha256_crypt__min_rounds = 80000 sha512_crypt__min_rounds = 60000 admin__sha256_crypt__min_rounds = 160000 |