cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Tests as filters were deprecated, remove unused param (#57796)

Browse source
This commit is contained in:
Martin Krizek 2019-06-13 21:36:53 +02:00 committed by Sam Doran
parent 1d6d19f400
commit 61ff61cdf6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/conditional.py
View file

@ -172,7 +172,7 @@ class Conditional:
) )
try: try:
e = templar.environment.overlay() e = templar.environment.overlay()
e.filters.update(templar._get_filters(e.filters)) e.filters.update(templar._get_filters())
e.tests.update(templar._get_tests()) e.tests.update(templar._get_tests())
res = e._parse(conditional, None, None) res = e._parse(conditional, None, None)

4
lib/ansible/template/__init__.py
View file

@ -442,7 +442,7 @@ class Templar:
self._no_type_regex = re.compile(r'.*?\|\s*(?:%s)(?:\([^\|]*\))?\s*\)?\s*(?:%s)' % self._no_type_regex = re.compile(r'.*?\|\s*(?:%s)(?:\([^\|]*\))?\s*\)?\s*(?:%s)' %
('|'.join(C.STRING_TYPE_FILTERS), self.environment.variable_end_string)) ('|'.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 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())) setattr(myenv, key, ast.literal_eval(val.strip()))
# Adds Ansible custom filters and tests # 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()) myenv.tests.update(self._get_tests())
if escape_backslashes: if escape_backslashes: