From 04f5d366684220438fc0093d28c3599cdd5650a1 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 19 Jun 2025 09:30:18 +0200 Subject: [PATCH] Removed wrong import --- modoboa/core/utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modoboa/core/utils.py b/modoboa/core/utils.py index 820ded898..32615d79a 100644 --- a/modoboa/core/utils.py +++ b/modoboa/core/utils.py @@ -8,12 +8,13 @@ from typing import Optional from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric import rsa +from django.conf import settings from django.utils.translation import gettext as _ from modoboa.core.extensions import exts_pool from modoboa.core.password_hashers import get_configured_password_hasher, PasswordHasher from modoboa.lib.api_client import ModoAPIClient -from modoboa.rspamd.utils import check_rspamd_installed, get_rspamd_options +from modoboa.rspamd.utils import get_rspamd_options def parse_map_file(path): @@ -90,7 +91,7 @@ def generate_rsa_private_key(storage_path: str) -> bool: return True -def check_for_deprecated_password_schemes() -> Optional[type[PasswordHasher]]: +def check_for_deprecated_password_schemes() -> Optional[type[PasswordHasher]]: # NOQA """Check if deprecated password scheme is still in use.""" from modoboa.core import models @@ -108,7 +109,7 @@ def get_capabilities(): """Return the list of capabilities of this modoboa instance.""" capabilities = {} # Rspamd - is_rspamd_installed = check_rspamd_installed() + is_rspamd_installed = "modoboa.rspamd" in settings.MODOBOA_APPS if is_rspamd_installed: rspamd_options = get_rspamd_options() capabilities.update({"rspamd": rspamd_options})