diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py index 73061befa..0cf69528a 100644 --- a/modoboa/core/app_settings.py +++ b/modoboa/core/app_settings.py @@ -48,8 +48,8 @@ class GeneralParametersForm(param_forms.AdminParametersForm): password_scheme = forms.ChoiceField( label=ugettext_lazy("Default password scheme"), choices=[(hasher.name, ugettext_lazy(hasher.label)) - for hasher in PasswordHasher.get_password_hashers() - if hasher().scheme in get_dovecot_schemes()], + for hasher in PasswordHasher.get_password_hashers() + if hasher().scheme in get_dovecot_schemes()], initial="sha512crypt", help_text=ugettext_lazy("Scheme used to crypt mailbox passwords"), widget=forms.Select(attrs={"class": "form-control"}) diff --git a/modoboa/core/password_hashers/__init__.py b/modoboa/core/password_hashers/__init__.py index e8463ae9a..11e076cf1 100644 --- a/modoboa/core/password_hashers/__init__.py +++ b/modoboa/core/password_hashers/__init__.py @@ -53,6 +53,7 @@ def get_dovecot_schemes(): except OSError: pass else: - supported_schemes = ["{{{}}}".format(scheme) for scheme in force_text(schemes).split()] + supported_schemes = ["{{{}}}".format(scheme) + for scheme in force_text(schemes).split()] return supported_schemes diff --git a/modoboa/core/password_hashers/base.py b/modoboa/core/password_hashers/base.py index 1f9b37653..3d8d2b354 100644 --- a/modoboa/core/password_hashers/base.py +++ b/modoboa/core/password_hashers/base.py @@ -70,6 +70,7 @@ class PasswordHasher(object): @classmethod def get_password_hashers(cls): + """Return all the PasswordHasher supported by Modoboa""" return cls.__subclasses__()