From 8d40f0cb4f16bbadf35433db0bee50c11ffc902d Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Wed, 10 Jun 2026 15:06:18 +0200 Subject: [PATCH] dav_base: moved constants into config --- dav_base/config/__init__.py | 1 + dav_base/config/apps.py | 2 +- dav_base/{ => config}/constants.py | 0 dav_base/config/modules.py | 2 +- dav_base/console_scripts/admin.py | 2 +- dav_base/management/commands/enable_module.py | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) rename dav_base/{ => config}/constants.py (100%) diff --git a/dav_base/config/__init__.py b/dav_base/config/__init__.py index 8b9aad3..e9faa50 100644 --- a/dav_base/config/__init__.py +++ b/dav_base/config/__init__.py @@ -1,2 +1,3 @@ +from .constants import DJANGO_MAIN_MODULE, MODULE_APP_SETTINGS_PREFIX, MODULES_CONFIG_FILE_NAME from . import apps from . import modules diff --git a/dav_base/config/apps.py b/dav_base/config/apps.py index 93cd081..9e2aff9 100644 --- a/dav_base/config/apps.py +++ b/dav_base/config/apps.py @@ -4,7 +4,7 @@ import re from django.apps import AppConfig as _AppConfig from django.core.exceptions import ImproperlyConfigured -from ..constants import DJANGO_MAIN_MODULE, MODULE_APP_SETTINGS_PREFIX +from ..config import DJANGO_MAIN_MODULE, MODULE_APP_SETTINGS_PREFIX logger = logging.getLogger(__name__) diff --git a/dav_base/constants.py b/dav_base/config/constants.py similarity index 100% rename from dav_base/constants.py rename to dav_base/config/constants.py diff --git a/dav_base/config/modules.py b/dav_base/config/modules.py index 2ff177c..78673a0 100644 --- a/dav_base/config/modules.py +++ b/dav_base/config/modules.py @@ -5,7 +5,7 @@ from importlib.resources import files as resource_files from django.conf import settings from django.urls import re_path, include -from ..constants import DJANGO_MAIN_MODULE, MODULES_CONFIG_FILE_NAME +from ..config import DJANGO_MAIN_MODULE, MODULES_CONFIG_FILE_NAME class ModuleConfigError(Exception): diff --git a/dav_base/console_scripts/admin.py b/dav_base/console_scripts/admin.py index 67fda81..a14651e 100644 --- a/dav_base/console_scripts/admin.py +++ b/dav_base/console_scripts/admin.py @@ -5,7 +5,7 @@ import sys from importlib.resources import files as resource_files from django.core.management import execute_from_command_line -from dav_base.constants import DJANGO_MAIN_MODULE, MODULE_APP_SETTINGS_PREFIX +from dav_base.config import DJANGO_MAIN_MODULE, MODULE_APP_SETTINGS_PREFIX from dav_base.config.modules import ModuleConfig VERSION = '0.1' diff --git a/dav_base/management/commands/enable_module.py b/dav_base/management/commands/enable_module.py index 1ee31b7..c1e5812 100644 --- a/dav_base/management/commands/enable_module.py +++ b/dav_base/management/commands/enable_module.py @@ -3,7 +3,7 @@ from importlib.resources import files as resource_files from django.conf import settings from django.core.management.base import BaseCommand, CommandError -from dav_base.constants import DJANGO_MAIN_MODULE, MODULE_APP_SETTINGS_PREFIX +from dav_base.config import DJANGO_MAIN_MODULE, MODULE_APP_SETTINGS_PREFIX from dav_base.config.modules import ModuleMeta