summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/fragments/remove-templar-shared_loader_obj-arg.yml2
-rw-r--r--lib/ansible/template/__init__.py9
-rw-r--r--test/sanity/ignore.txt1
3 files changed, 3 insertions, 9 deletions
diff --git a/changelogs/fragments/remove-templar-shared_loader_obj-arg.yml b/changelogs/fragments/remove-templar-shared_loader_obj-arg.yml
new file mode 100644
index 0000000000..f8a2a030d1
--- /dev/null
+++ b/changelogs/fragments/remove-templar-shared_loader_obj-arg.yml
@@ -0,0 +1,2 @@
+removed_features:
+ - "``Templar`` - remove deprecated ``shared_loader_obj`` parameter of ``__init__``"
diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py
index a623ba52fe..c265b7fc30 100644
--- a/lib/ansible/template/__init__.py
+++ b/lib/ansible/template/__init__.py
@@ -545,14 +545,7 @@ class Templar:
The main class for templating, with the main entry-point of template().
'''
- def __init__(self, loader, shared_loader_obj=None, variables=None):
- if shared_loader_obj is not None:
- display.deprecated(
- "The `shared_loader_obj` option to `Templar` is no longer functional, "
- "ansible.plugins.loader is used directly instead.",
- version='2.16',
- )
-
+ def __init__(self, loader, variables=None):
self._loader = loader
self._available_variables = {} if variables is None else variables
diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt
index ed765a8415..411d370588 100644
--- a/test/sanity/ignore.txt
+++ b/test/sanity/ignore.txt
@@ -243,5 +243,4 @@ test/units/utils/collection_loader/test_collection_loader.py pylint:undefined-va
lib/ansible/playbook/helpers.py pylint:ansible-deprecated-version
lib/ansible/playbook/included_file.py pylint:ansible-deprecated-version
lib/ansible/plugins/action/__init__.py pylint:ansible-deprecated-version
-lib/ansible/template/__init__.py pylint:ansible-deprecated-version
lib/ansible/module_utils/common/file.py pylint:ansible-deprecated-version