diff options
author | Martin Krizek <martin.krizek@gmail.com> | 2019-06-13 21:36:53 +0200 |
---|---|---|
committer | Sam Doran <sdoran@redhat.com> | 2019-06-13 15:36:52 -0400 |
commit | 61ff61cdf6a6cfb749d550a8ea781856dfda73a4 (patch) | |
tree | 92a730dd607a2b2611dbad3bdcc38560feeb6609 /lib | |
parent | 1d6d19f4007f1872f88d9aea69e18e8bc2a7a6c2 (diff) | |
download | ansible-61ff61cdf6a6cfb749d550a8ea781856dfda73a4.tar.gz |
Tests as filters were deprecated, remove unused param (#57796)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ansible/playbook/conditional.py | 2 | ||||
-rw-r--r-- | lib/ansible/template/__init__.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/playbook/conditional.py b/lib/ansible/playbook/conditional.py index 296c213d6d..6c827e9d67 100644 --- a/lib/ansible/playbook/conditional.py +++ b/lib/ansible/playbook/conditional.py @@ -172,7 +172,7 @@ class Conditional: ) try: e = templar.environment.overlay() - e.filters.update(templar._get_filters(e.filters)) + e.filters.update(templar._get_filters()) e.tests.update(templar._get_tests()) res = e._parse(conditional, None, None) diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py index e942ce5da6..857d950f28 100644 --- a/lib/ansible/template/__init__.py +++ b/lib/ansible/template/__init__.py @@ -442,7 +442,7 @@ class Templar: self._no_type_regex = re.compile(r'.*?\|\s*(?:%s)(?:\([^\|]*\))?\s*\)?\s*(?:%s)' % ('|'.join(C.STRING_TYPE_FILTERS), self.environment.variable_end_string)) - def _get_filters(self, builtin_filters): + def _get_filters(self): ''' Returns filter plugins, after loading and caching them if need be ''' @@ -775,7 +775,7 @@ class Templar: setattr(myenv, key, ast.literal_eval(val.strip())) # Adds Ansible custom filters and tests - myenv.filters.update(self._get_filters(myenv.filters)) + myenv.filters.update(self._get_filters()) myenv.tests.update(self._get_tests()) if escape_backslashes: |