diff --git a/radicale/auth/__init__.py b/radicale/auth/__init__.py index 415c91b..fcd6c90 100644 --- a/radicale/auth/__init__.py +++ b/radicale/auth/__init__.py @@ -35,7 +35,7 @@ INTERNAL_TYPES = ("none", "remote_user", "http_x_remote_user", "htpasswd") def load(configuration): """Load the authentication module chosen in configuration.""" - return utils.loader(INTERNAL_TYPES, "auth", "Auth", configuration) + return utils.load_plugin(INTERNAL_TYPES, "auth", "Auth", configuration) class BaseAuth: diff --git a/radicale/rights/__init__.py b/radicale/rights/__init__.py index f775261..bf76158 100644 --- a/radicale/rights/__init__.py +++ b/radicale/rights/__init__.py @@ -37,7 +37,7 @@ INTERNAL_TYPES = ("authenticated", "owner_write", "owner_only", "from_file") def load(configuration): """Load the rights module chosen in configuration.""" - return utils.loader(INTERNAL_TYPES, "rights", "Rights", configuration) + return utils.load_plugin(INTERNAL_TYPES, "rights", "Rights", configuration) def intersect_permissions(a, b="RrWw"): diff --git a/radicale/storage/__init__.py b/radicale/storage/__init__.py index cea629a..7526d3d 100644 --- a/radicale/storage/__init__.py +++ b/radicale/storage/__init__.py @@ -42,7 +42,8 @@ CACHE_VERSION = (";".join(pkg_resources.get_distribution(pkg).version def load(configuration): """Load the storage module chosen in configuration.""" - return utils.loader(INTERNAL_TYPES, "storage", "Storage", configuration) + return utils.load_plugin( + INTERNAL_TYPES, "storage", "Storage", configuration) class ComponentExistsError(ValueError): diff --git a/radicale/utils.py b/radicale/utils.py index cb63f5e..74b9bad 100644 --- a/radicale/utils.py +++ b/radicale/utils.py @@ -21,7 +21,7 @@ from importlib import import_module from radicale.log import logger -def loader(internal_types, module_name, class_name, configuration): +def load_plugin(internal_types, module_name, class_name, configuration): type_ = configuration.get(module_name, "type") if type_ in internal_types: module = "radicale.%s.%s" % (module_name, type_) diff --git a/radicale/web/__init__.py b/radicale/web/__init__.py index dda2260..0a40285 100644 --- a/radicale/web/__init__.py +++ b/radicale/web/__init__.py @@ -28,7 +28,7 @@ INTERNAL_TYPES = ("none", "internal") def load(configuration): """Load the web module chosen in configuration.""" - return utils.loader(INTERNAL_TYPES, "web", "Web", configuration) + return utils.load_plugin(INTERNAL_TYPES, "web", "Web", configuration) class BaseWeb: