From 80b50f05da01327f31f04c82346aee52f54c4c52 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 20 Sep 2025 12:38:13 -0500 Subject: [PATCH] fix: do not use appname for config extension entry points --- docs/glossary.rst | 2 ++ docs/narr/config/object.rst | 2 ++ src/wuttjamaican/conf.py | 4 +++- tests/test_conf.py | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/glossary.rst b/docs/glossary.rst index 0e4c48a..c01a4ec 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -137,6 +137,8 @@ Glossary The intention is that all config extensions will have been applied before the :term:`app handler` is created. + See also :ref:`config-extensions`. + config file A file which contains :term:`config settings`. See also :doc:`narr/config/files`. diff --git a/docs/narr/config/object.rst b/docs/narr/config/object.rst index b792133..8eb9448 100644 --- a/docs/narr/config/object.rst +++ b/docs/narr/config/object.rst @@ -56,6 +56,8 @@ to solve the "chicken-vs-egg" problem:: app = config.get_app() +.. _config-extensions: + Extending the Config Object --------------------------- diff --git a/src/wuttjamaican/conf.py b/src/wuttjamaican/conf.py index d30f90c..c799da6 100644 --- a/src/wuttjamaican/conf.py +++ b/src/wuttjamaican/conf.py @@ -1040,7 +1040,9 @@ def make_config( # pylint: disable=too-many-arguments,too-many-positional-argum # maybe extend config object if extend: if not extension_entry_points: - extension_entry_points = f"{appname}.config.extensions" + # nb. must not use appname here, entry points must be + # consistent regardless of appname + extension_entry_points = "wutta.config.extensions" # apply all registered extensions # TODO: maybe let config disable some extensions? diff --git a/tests/test_conf.py b/tests/test_conf.py index 18953b3..684387e 100644 --- a/tests/test_conf.py +++ b/tests/test_conf.py @@ -931,7 +931,7 @@ class TestMakeConfig(FileTestCase): WuttaConfig.assert_called_once_with( [], appname="wuttatest", usedb=None, preferdb=None ) - load_entry_points.assert_called_once_with("wuttatest.config.extensions") + load_entry_points.assert_called_once_with("wutta.config.extensions") # confirm extensions are invoked load_entry_points.reset_mock() @@ -945,7 +945,7 @@ class TestMakeConfig(FileTestCase): WuttaConfig.assert_called_once_with( [], appname="wuttatest", usedb=None, preferdb=None ) - load_entry_points.assert_called_once_with("wuttatest.config.extensions") + load_entry_points.assert_called_once_with("wutta.config.extensions") foo_cls.assert_called_once_with() foo_obj.configure.assert_called_once_with(testconfig) foo_obj.startup.assert_called_once_with(testconfig)