NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Rename plugin_apps to django_apps for clarity

Browse Source
This commit is contained in:
jeremystretch 2022-09-30 17:01:37 -04:00
parent 0607295081
commit f7860138c7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/netbox/settings.py
View File

@ -671,15 +671,15 @@ for plugin_name in PLUGINS:
plugin_module = "{}.{}".format(plugin_config.__module__, plugin_config.__name__) # type: ignore plugin_module = "{}.{}".format(plugin_config.__module__, plugin_config.__name__) # type: ignore
# Gather additionnal apps to load alongside this plugin # Gather additional apps to load alongside this plugin
plugin_apps = plugin_config.django_apps django_apps = plugin_config.django_apps
if plugin_name in plugin_apps: if plugin_name in django_apps:
plugin_apps.pop(plugin_name) django_apps.pop(plugin_name)
if plugin_module not in plugin_apps: if plugin_module not in django_apps:
plugin_apps.append(plugin_module) django_apps.append(plugin_module)
# Test if we can import all modules (or its parent, for PluginConfigs and AppConfigs) # Test if we can import all modules (or its parent, for PluginConfigs and AppConfigs)
for app in plugin_apps: for app in django_apps:
if "." in app: if "." in app:
parts = app.split(".") parts = app.split(".")
spec = importlib.util.find_spec(".".join(parts[:-1])) spec = importlib.util.find_spec(".".join(parts[:-1]))
@ -687,12 +687,12 @@ for plugin_name in PLUGINS:
spec = importlib.util.find_spec(app) spec = importlib.util.find_spec(app)
if spec is None: if spec is None:
raise ImproperlyConfigured( raise ImproperlyConfigured(
f"Plugin {plugin_name} provides a 'config' variable which contains invalid 'plugin_apps'. " f"Failed to load django_apps specified by plugin {plugin_name}: {django_apps} "
f"The module {app}, from this list, cannot be imported. Check that the additionnal app has been " f"The module {app} cannot be imported. Check that the necessary package has been "
"installed within the correct Python environment." "installed within the correct Python environment."
) )
INSTALLED_APPS.extend(plugin_apps) INSTALLED_APPS.extend(django_apps)
# Preserve uniqueness of the INSTALLED_APPS list, we keep the last occurence # Preserve uniqueness of the INSTALLED_APPS list, we keep the last occurence
sorted_apps = reversed(list(dict.fromkeys(reversed(INSTALLED_APPS)))) sorted_apps = reversed(list(dict.fromkeys(reversed(INSTALLED_APPS))))