diff options
| author | Martin Krizek <martin.krizek@gmail.com> | 2021-01-21 11:22:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 11:22:33 +0100 |
| commit | 7f9ac0f364b6faef0c57cd08761de3c2f9c7d99a (patch) | |
| tree | 220cd1d32afaa60cd27d1308baafe19f8e0302cd /lib/ansible/playbook/conditional.py | |
| parent | 823c72bcb59a5628c0ce21f2145f37f61bae6db9 (diff) | |
| download | ansible-7f9ac0f364b6faef0c57cd08761de3c2f9c7d99a.tar.gz | |
Consolidate filters/tests handling into JinjaPluginIntercept (#71463)
* Consolidate filters/tests handling into JinjaPluginIntercept
ci_complete
* Postpone loading all ansible plugins
* Do we need to create an overlay?
ci_complete
* Typo
ci_complete
* Add FIXME
* conditional.py: use public Environment.parse() method
* Remove remaining occurrences of shared_loader_obj being passed to Templar
* __UNROLLED__ not needed with this change anymore
* Incorrect rebase at some point?
Diffstat (limited to 'lib/ansible/playbook/conditional.py')
| -rw-r--r-- | lib/ansible/playbook/conditional.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/ansible/playbook/conditional.py b/lib/ansible/playbook/conditional.py index fe5e353d64..a34b43e132 100644 --- a/lib/ansible/playbook/conditional.py +++ b/lib/ansible/playbook/conditional.py @@ -182,12 +182,8 @@ class Conditional: inside_yield=inside_yield ) try: - e = templar.environment.overlay() - e.filters.update(templar.environment.filters) - e.tests.update(templar.environment.tests) - - res = e._parse(conditional, None, None) - res = generate(res, e, None, None) + res = templar.environment.parse(conditional, None, None) + res = generate(res, templar.environment, None, None) parsed = ast.parse(res, mode='exec') cnv = CleansingNodeVisitor() |