diff options
author | Martin Krizek <martin.krizek@gmail.com> | 2019-05-20 17:49:54 +0200 |
---|---|---|
committer | Brian Coca <bcoca@users.noreply.github.com> | 2019-05-20 11:49:54 -0400 |
commit | 34e9d6781b24fb8a6ec8f33701275fca351833c1 (patch) | |
tree | 7df2124ac47de6a2baacf72be152930dfec05d7e /lib/ansible/template/vars.py | |
parent | bd061fd6322593bf44c5d368b0498bad5e8ec78a (diff) | |
download | ansible-34e9d6781b24fb8a6ec8f33701275fca351833c1.tar.gz |
Templar: encapsulate _available_variables (#55435)
Ensure variables are reset between iterations
Diffstat (limited to 'lib/ansible/template/vars.py')
-rw-r--r-- | lib/ansible/template/vars.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ansible/template/vars.py b/lib/ansible/template/vars.py index e2c95b047c..164cf1a1ab 100644 --- a/lib/ansible/template/vars.py +++ b/lib/ansible/template/vars.py @@ -60,7 +60,7 @@ class AnsibleJ2Vars(Mapping): self._locals[key] = val def __contains__(self, k): - if k in self._templar._available_variables: + if k in self._templar.available_variables: return True if k in self._locals: return True @@ -73,16 +73,16 @@ class AnsibleJ2Vars(Mapping): def __iter__(self): keys = set() - keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras) + keys.update(self._templar.available_variables, self._locals, self._globals, *self._extras) return iter(keys) def __len__(self): keys = set() - keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras) + keys.update(self._templar.available_variables, self._locals, self._globals, *self._extras) return len(keys) def __getitem__(self, varname): - if varname not in self._templar._available_variables: + if varname not in self._templar.available_variables: if varname in self._locals: return self._locals[varname] for i in self._extras: @@ -93,7 +93,7 @@ class AnsibleJ2Vars(Mapping): else: raise KeyError("undefined variable: %s" % varname) - variable = self._templar._available_variables[varname] + variable = self._templar.available_variables[varname] # HostVars is special, return it as-is, as is the special variable # 'vars', which contains the vars structure |